[Emacs-diffs] /srv/bzr/emacs/trunk r106277: (url-cookie-expired-p): Protect against zero-length cookie expiry dates.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 106277
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2011-11-03 22:53:59 +0100
message:
  (url-cookie-expired-p): Protect against zero-length cookie expiry dates.
modified:
  lisp/url/ChangeLog
  lisp/url/url-cookie.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2011-10-20 00:26:14 +0000
+++ b/lisp/url/ChangeLog        2011-11-03 21:53:59 +0000
@@ -1,3 +1,8 @@
+2011-11-03  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * url-cookie.el (url-cookie-expired-p): Protect against
+       zero-length cookie expiry dates.
+
 2011-10-19  Chong Yidong  <address@hidden>
 
        * url-handlers.el (url-handler-mode): Doc fix.

=== modified file 'lisp/url/url-cookie.el'
--- a/lisp/url/url-cookie.el    2011-05-29 02:45:03 +0000
+++ b/lisp/url/url-cookie.el    2011-11-03 21:53:59 +0000
@@ -156,7 +156,8 @@
 (defun url-cookie-expired-p (cookie)
   "Return non-nil if COOKIE is expired."
   (let ((exp (url-cookie-expires cookie)))
-    (and exp (> (float-time) (float-time (date-to-time exp))))))
+    (and (> (length exp) 0)
+        (> (float-time) (float-time (date-to-time exp))))))
 
 (defun url-cookie-retrieve (host &optional localpart secure)
   "Retrieve all cookies for a specified HOST and LOCALPART."