Cope with empty return-path header.

svn path=/trunk/; revision=1704

2 files changed, 6 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 32699b89..8540def7 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,7 @@ fetchmail-4.4.0 (Fri Mar 13 15:48:27 EST 1998):
 * Fix timer-leak problem with the SIGALRM fix, pointed out by Dave Bodenstab.
 * Deal with more M$ Exchange braindamage (violating an RFC1939 limit).
 * Allow spaces in IMAP usernames (thank Juerg Wanner <juerg.wanner@ubs.com>).
+* Handle empty Return-Path (thank Dmitry Yaitskov <dyaitskov@insystems.com>).
 * Improvements in UID handling; should be a cleaner fix for Dick van den Burg.
 
 There are 270 people on fetchmail-friends and 160 on fetchmail-announce.
diff --git a/driver.c b/driver.c
index 018b17cc..e8c51017 100644
--- a/driver.c
+++ b/driver.c
@@ -830,10 +830,13 @@ int num;		/* index of message */
 	 * If the SMTP server conforms to the standards, and fetchmail gets the
 	 * envelope sender from the Return-Path, the new Return-Path should be
 	 * exactly the same as the original one.
+	 *
+	 * Empty Return-Path headers will be ignored.
+	 *
 	 */
-	if (!strncasecmp("Return-Path:", line, 12))
+	if (!strncasecmp("Return-Path:", line, 12) && (cp = nxtaddr(line)))
 	{
-	    strcpy(return_path, nxtaddr(line));
+	    strcpy(return_path, cp);
 	    if (!ctl->mda) {
 		free(line);
 		continue;