From: Timo Sirainen <tss@iki.fi>
Date: Thu, 17 Jul 2003 14:50:45 +0000 (+0300)
Subject: Don't crash if there's no domain in address
X-Git-Tag: 1.1.alpha1~4475
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4053e3c66d5c3d898fa3284deea48f333ba1408e;p=thirdparty%2Fdovecot%2Fcore.git

Don't crash if there's no domain in address

--HG--
branch : HEAD
---

diff --git a/src/lib-mail/message-address.c b/src/lib-mail/message-address.c
index bd84db4824..c28c6140f8 100644
--- a/src/lib-mail/message-address.c
+++ b/src/lib-mail/message-address.c
@@ -252,14 +252,14 @@ void message_address_write(string_t *str, const struct message_address *addr)
 		} 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 @@ void message_address_write(string_t *str, const struct message_address *addr)
 				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, '>');
 		}