[dovecot-cvs] dovecot/src/lib-mail message-address.c,1.5,1.6

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib-mail
In directory danu:/tmp/cvs-serv15899/src/lib-mail

Modified Files:
	message-address.c 
Log Message:
Don't crash if there's no domain in address



Index: message-address.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-mail/message-address.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- message-address.c	5 Mar 2003 20:54:17 -0000	1.5
+++ message-address.c	17 Jul 2003 14:50:45 -0000	1.6
@@ -252,14 +252,14 @@
 		} else if ((addr->name == NULL || *addr->name == '\0') &&
 			   addr->route == NULL) {
 			i_assert(addr->mailbox != NULL);
-			i_assert(addr->domain != NULL);
 
 			str_append(str, addr->mailbox);
-			str_append_c(str, '@');
-			str_append(str, addr->domain);
+			if (addr->domain != NULL) {
+				str_append_c(str, '@');
+				str_append(str, addr->domain);
+			}
 		} else {
 			i_assert(addr->mailbox != NULL);
-			i_assert(addr->domain != NULL);
 
 			if (addr->name != NULL) {
 				str_append(str, addr->name);
@@ -272,8 +272,10 @@
 				str_append_c(str, ':');
 			}
 			str_append(str, addr->mailbox);
-			str_append_c(str, '@');
-			str_append(str, addr->domain);
+			if (addr->domain != NULL) {
+				str_append_c(str, '@');
+				str_append(str, addr->domain);
+			}
 			str_append_c(str, '>');
 		}