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

2b455160 · Lars Magne Ingebrigtsen · Katsumi Yamaoka · dbd5ffad · 2b455160 · 2b455160
Commit 2b455160 authored Apr 21, 2011 by Lars Magne Ingebrigtsen Committed by Katsumi Yamaoka Apr 21, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

lisp/gnus/ChangeLog lisp/gnus/ChangeLog +4 -0

lisp/gnus/shr.el lisp/gnus/shr.el +2 -1

No files found.
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
+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.

--- 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))