From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Diane Murray Newsgroups: gmane.emacs.bugs Subject: [Patch] [CVS] rmail-spam-filter error when missing "From:" field Date: Wed, 10 Nov 2004 00:30:22 +0100 Message-ID: <87pt2mwqgh.fsf@spargel.okie.doke> NNTP-Posting-Host: deer.gmane.org X-Trace: sea.gmane.org 1100042940 15140 80.91.229.6 (9 Nov 2004 23:29:00 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 9 Nov 2004 23:29:00 +0000 (UTC) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Nov 10 00:28:48 2004 Return-path: Original-Received: from lists.gnu.org ([199.232.76.165]) by deer.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 1CRfPs-0001lf-00 for ; Wed, 10 Nov 2004 00:28:48 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRfYI-0001rT-6d for geb-bug-gnu-emacs@m.gmane.org; Tue, 09 Nov 2004 18:37:30 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CRfY4-0001fN-7k for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2004 18:37:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CRfY2-0001e8-G2 for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2004 18:37:14 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CRfY2-0001du-Br for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2004 18:37:14 -0500 Original-Received: from [194.25.134.20] (helo=mailout08.sul.t-online.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CRfPU-00075I-SE for bug-gnu-emacs@gnu.org; Tue, 09 Nov 2004 18:28:25 -0500 Original-Received: from fwd09.aul.t-online.de by mailout08.sul.t-online.com with smtp id 1CRfPT-00083B-01; Wed, 10 Nov 2004 00:28:23 +0100 Original-Received: from spargel.okie.doke (XZZaQ0ZHge8QLcbMENcDXx2lu5PDDbzhSlOYZ+XWM553cYjPG86pgi@[217.86.180.161]) by fmrl09.sul.t-online.com with esmtp id 1CRfPI-0lHJLs0; Wed, 10 Nov 2004 00:28:12 +0100 Original-To: bug-gnu-emacs@gnu.org X-ID: XZZaQ0ZHge8QLcbMENcDXx2lu5PDDbzhSlOYZ+XWM553cYjPG86pgi@t-dialin.net X-TOI-MSGID: 2247780b-3970-4496-9c4e-208a00416294 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.bugs:9645 X-Report-Spam: http://spam.gmane.org/gmane.emacs.bugs:9645 When there is no "From:" field in a received message being checked by the spam filter, a `(wrong-type-argument stringp nil)' error occurs. The following patch corrects this. * mail/rmail-spam-filter.el (rmail-spam-filter): Only check white list if `message-sender' is non-nil. *** rmail-spam-filter.el 16 Feb 2004 22:57:42 +0100 1.8 --- rmail-spam-filter.el 09 Nov 2004 22:38:46 +0100 *************** *** 302,314 **** ;; Check white list, and likewise cause while loop ;; bypass. ! (if (let ((white-list rsf-white-list) ! (found nil)) ! (while (and (not found) white-list) ! (if (string-match (car white-list) message-sender) ! (setq found t) ! (setq white-list (cdr white-list)))) ! found) (setq exit-while-loop t maybe-spam nil this-is-a-spam-email nil)) --- 302,315 ---- ;; Check white list, and likewise cause while loop ;; bypass. ! (if (and message-sender ! (let ((white-list rsf-white-list) ! (found nil)) ! (while (and (not found) white-list) ! (if (string-match (car white-list) message-sender) ! (setq found t) ! (setq white-list (cdr white-list)))) ! found)) (setq exit-while-loop t maybe-spam nil this-is-a-spam-email nil))