[dovecot-cvs] dovecot-lda/src deliver.c,1.20,1.21

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot-lda/src
In directory talvi:/tmp/cvs-serv32449

Modified Files:
	deliver.c 
Log Message:
Don't crash if we don't have Return-Path header



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/deliver.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- deliver.c	23 Sep 2005 13:01:10 -0000	1.20
+++ deliver.c	24 Sep 2005 10:24:02 -0000	1.21
@@ -129,9 +129,10 @@
 	const char *str;
 
 	str = mail_get_first_header(mail, "Return-Path");
-	addr = message_address_parse(pool_datastack_create(),
-				     (const unsigned char *)str,
-				     strlen(str), 1);
+	addr = str == NULL ? NULL :
+		message_address_parse(pool_datastack_create(),
+				      (const unsigned char *)str,
+				      strlen(str), 1);
 	return addr == NULL || addr->mailbox == NULL || addr->domain == NULL ?
 		NULL : t_strconcat(addr->mailbox, "@", addr->domain, NULL);
 }