shr.el (shr-expand-url): Protect against null urls.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 9c37b9bf576c9e15f4155bba5b1c831d8bf2165f..5803fe7d0fd0c2fd0f67e077b3af2e3b1c7b7a1a 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * shr.el (shr-expand-url): Protect against null urls.
+
 2011-04-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * shr.el (shr-base): New binding.

diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index f27705e0bf5bea855756c6a6cac8970f9d86b2a8..ee231e6a82fbdc5c7d5c9f71fbe6fb3beb0e8edb 100644 (file)
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -397,7 +397,8 @@ redirects somewhere else."
 (defun shr-expand-url (url)
   (cond
    ;; Absolute URL.
-   ((or (string-match "\\`[a-z]*:" url)
+   ((or (not url)
+       (string-match "\\`[a-z]*:" url)
        (not shr-base))
     url)
    ((and (not (string-match "/\\'" shr-base))