From: Pali Rohár <pali.rohar@gmail.com>
Date: Sun, 5 Jun 2016 13:48:15 +0000 (+0200)
Subject: lib-mail: message_address_write: Fix generating group list with empty name
X-Git-Tag: 2.3.0.rc1~3542
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d56bcbb354f1495e3323c7816cf69638975a8608;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: message_address_write: Fix generating group list with empty name

Empty name for group list must be quoted.

Test case:

  { { name = NULL, mailbox = "", domain = NULL }, { name = NULL, mailbox = NULL, domain = NULL } }

converts to:

  "":;
---

diff --git a/src/lib-mail/message-address.c b/src/lib-mail/message-address.c
index efa91fd289..9ce4a55e48 100644
--- a/src/lib-mail/message-address.c
+++ b/src/lib-mail/message-address.c
@@ -357,8 +357,12 @@ void message_address_write(string_t *str, const struct message_address *addr)
 			if (!in_group) {
 				/* beginning of group. mailbox is the group
 				   name, others are NULL. */
-				if (addr->mailbox != NULL)
+				if (addr->mailbox != NULL && *addr->mailbox != '\0') {
 					str_append(str, addr->mailbox);
+				} else {
+					/* empty group name needs to be quoted */
+					str_append(str, "\"\"");
+				}
 				str_append(str, ": ");
 				first = TRUE;
 			} else {