message: fix message-bogus-recipient-p with nil address

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1bb5e2..db11abd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-10  Julien Danjou  <julien@danjou.info>
+
+       * message.el (message-bogus-recipient-p): Set address to "" if nil.
+
 2010-12-10  Andrew Cohen  <cohen@andy.bu.edu>
 
        * nnir.el (nnir-request-expire-articles): Ignore expiry except for

diff --git a/lisp/message.el b/lisp/message.el
index 1313f56..e7fe660 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4305,9 +4305,10 @@ matching entry in `message-bogus-addresses'."
   ;; FIXME: How about "foo@subdomain", when the MTA adds ".domain.tld"?
   (let (found)
     (mapc (lambda (address)
-           (setq address (cadr address))
+           (setq address (or (cadr address) ""))
            (when
-               (or (not
+               (or (string= "" address)
+                    (not
                     (or
                      (not (string-match "@" address))
                      (string-match
@@ -4321,7 +4322,7 @@ matching entry in `message-bogus-addresses'."
                                               "\\|")
                                  message-bogus-addresses)))
                           (string-match re address))))
-                        (push address found)))
+              (push address found)))
          ;;
          (mail-extract-address-components recipients t))
     found))