Fix bug causing loops in sendto if there are scanner errors in addresses

SCCS-mr: usr.sbin/sendmail/src/version.c 079
SCCS-mr: usr.sbin/sendmail/src/recipient.c 079
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.247
SCCS-vsn: usr.sbin/sendmail/src/recipient.c 3.45

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 045d879..ff9cab9 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -2,7 +2,7 @@
 # include "sendmail.h"
 # include <sys/stat.h>
 
 # include "sendmail.h"
 # include <sys/stat.h>
 

-SCCSID(@(#)recipient.c 3.44            %G%);
+SCCSID(@(#)recipient.c 3.45            %G%);

 
 /*
 **  SENDTO -- Designate a send list.
 
 /*
 **  SENDTO -- Designate a send list.


@@ -76,7 +76,10 @@ sendto(list, copyf, ctladdr, qflags)
                while (isspace(*p) || *p == ',')
                        p++;
                if ((a = parse(p, (ADDRESS *) NULL, 1)) == NULL)
                while (isspace(*p) || *p == ',')
                        p++;
                if ((a = parse(p, (ADDRESS *) NULL, 1)) == NULL)

+               {
+                       p = DelimChar;

                        continue;
                        continue;

+               }

                p = DelimChar;
                a->q_next = al;
                a->q_alias = ctladdr;
                p = DelimChar;
                a->q_next = al;
                a->q_alias = ctladdr;

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index ff4b5b0..c920897 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,5 +1,5 @@
 # ifndef lint
 # ifndef lint

-static char    SccsId[] = "@(#)SendMail version 3.246 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.247 of %G%";

 # endif lint
 
 # endif lint
 

-char   Version[] = "3.246 [%G%]";
+char   Version[] = "3.247 [%G%]";