[Emacs-diffs] emacs/lisp/url url-cookie.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/01/14 20:47:02

Modified files:
        lisp/url       : url-cookie.el 

Log message:
        (url-cookie-retrieve): Handle null localpart.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/url/url-cookie.el?cvsroot=emacs&r1=1.29&r2=1.30

Patches:
Index: url-cookie.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/url/url-cookie.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- url-cookie.el       5 Jan 2009 03:24:16 -0000       1.29
+++ url-cookie.el       14 Jan 2009 20:47:02 -0000      1.30
@@ -223,7 +223,7 @@
                          (*   1 (string-to-number (aref exp-time 0))))))
        (> (- cur-norm exp-norm) 1))))))
 
-(defun url-cookie-retrieve (host localpart &optional secure)
+(defun url-cookie-retrieve (host &optional localpart secure)
   "Retrieve all the netscape-style cookies for a specified HOST and LOCALPART."
   (let ((storage (if secure
                     (append url-cookie-secure-storage url-cookie-storage)
@@ -232,7 +232,7 @@
        (cookies nil)
        (cur nil)
        (retval nil)
-       (localpart-regexp nil))
+       (localpart-match nil))
     (while storage
       (setq cur (car storage)
            storage (cdr storage)
@@ -251,9 +251,10 @@
          (while cookies
            (setq cur (car cookies)
                  cookies (cdr cookies)
-                 localpart-regexp (concat "^" (regexp-quote
-                                               (url-cookie-localpart cur))))
-           (if (and (string-match localpart-regexp localpart)
+                 localpart-match (let ((lp (url-cookie-localpart cur)))
+                                   (when lp
+                                     (concat "^" (regexp-quote lp)))))
+           (if (and (equal localpart localpart-match)
                     (not (url-cookie-expired-p cur)))
                (setq retval (cons cur retval))))))
     retval))