Fix core-dump bug.

svn path=/trunk/; revision=2234

2 files changed, 5 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index cd3f8cf9..267b3714 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@
 
 fetchmail-4.6.9 ():
 * Better RFC822 conformance in fetchmail trace headers.
+* Corrected MIME generation of bounce mail.
+* Prevent core dumps on 'for' and 'by' embedded in names (bug introduced 
+  in 4.6.8).
+
+There are 247 people on fetchmail-friends and 309 on fetchmail-announce.
 
 fetchmail-4.6.8 (Sat Nov 28 21:07:46 EST 1998):
 * Added bounce-mail capability on SMTP/ESMTP error conditions.
diff --git a/driver.c b/driver.c
index 42283c69..a313de19 100644
--- a/driver.c
+++ b/driver.c
@@ -251,10 +251,7 @@ static char *parse_received(struct query *ctl, char *bufp)
 	if (!(ok = strstr(base, "by")))
 	    break;
 	else if (!isspace(ok[-1]) || !isspace(ok[2]))
-	{
-	    ok = (char *)NULL;
 	    continue;
-	}
 	else
 	{
 	    char	*sp, *tp;
@@ -302,10 +299,7 @@ static char *parse_received(struct query *ctl, char *bufp)
 	    if (!(ok = strstr(base, "for")))
 		break;
 	    else if (!isspace(ok[-1]) || !isspace(ok[3]))
-	    {
-		ok = (char *)NULL;
 		continue;
-	    }
 	    else
 	    {
 		char	*sp, *tp;