[pkgsrc/trunk]: pkgsrc/mail/fetchmail certain email kills fetchmail. CAN-200...

[itojun <itojun%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3ca477dd85a3
branches:  trunk
changeset: 462680:3ca477dd85a3
user:      itojun <itojun%pkgsrc.org@localhost>
date:      Wed Oct 08 20:23:42 2003 +0000

description:
certain email kills fetchmail.  CAN-2003-0790

diffstat:

 mail/fetchmail/Makefile         |   4 ++--
 mail/fetchmail/patches/patch-ag |  22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diffs (39 lines):

diff -r dc00a99367c1 -r 3ca477dd85a3 mail/fetchmail/Makefile
--- a/mail/fetchmail/Makefile   Wed Oct 08 18:54:42 2003 +0000
+++ b/mail/fetchmail/Makefile   Wed Oct 08 20:23:42 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.133 2003/09/12 13:11:56 grant Exp $
+# $NetBSD: Makefile,v 1.134 2003/10/08 20:23:42 itojun Exp $
 
 DISTNAME=      fetchmail-6.2.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    mail
 MASTER_SITES=  http://catb.org/~esr/fetchmail/ \
                http://sunsite.unc.edu/pub/Linux/system/mail/pop/
diff -r dc00a99367c1 -r 3ca477dd85a3 mail/fetchmail/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/fetchmail/patches/patch-ag   Wed Oct 08 20:23:42 2003 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2003/10/08 20:23:43 itojun Exp $
+
+--- rfc822.c-  2003-10-06 13:28:06.000000000 +0900
++++ rfc822.c   2003-10-06 13:28:41.000000000 +0900
+@@ -176,7 +176,7 @@
+           case 3:     /* we're in a <>-enclosed address */
+               if (*from == '@' || *from == '!')
+                   has_host_part = TRUE;
+-              else if (*from == '>' && from[-1] != '<')
++              else if (*from == '>' && (from > buf && from[-1] != '<'))
+               {
+                   state = 1;
+                   if (!has_host_part)
+@@ -198,7 +198,7 @@
+       /*
+        * If we passed a comma, reset everything.
+        */
+-      if (from[-1] == ',' && !parendepth) {
++      if ((from > buf && from[-1] == ',') && !parendepth) {
+         has_host_part = has_bare_name_part = FALSE;
+         parens_from = NULL;
+       }