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

lib-mail: message_address_write: Fix generating empty group list

Empty group list ends with ": " not with ", ".

Test case:

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

converts to:

  group:;
---

diff --git a/src/lib-mail/message-address.c b/src/lib-mail/message-address.c
index 36cb483266..efa91fd289 100644
--- a/src/lib-mail/message-address.c
+++ b/src/lib-mail/message-address.c
@@ -340,6 +340,7 @@ message_address_parse(pool_t pool, const unsigned char *data, size_t size,
 
 void message_address_write(string_t *str, const struct message_address *addr)
 {
+	const char *tmp;
 	bool first = TRUE, in_group = FALSE;
 
 	/* a) mailbox@domain
@@ -365,7 +366,12 @@ void message_address_write(string_t *str, const struct message_address *addr)
 				i_assert(addr->mailbox == NULL);
 
 				/* cut out the ", " */
-				str_truncate(str, str_len(str)-2);
+				tmp = str_c(str)+str_len(str)-2;
+				i_assert((tmp[0] == ',' || tmp[0] == ':') && tmp[1] == ' ');
+				if (tmp[0] == ',' && tmp[1] == ' ')
+					str_truncate(str, str_len(str)-2);
+				else if (tmp[0] == ':' && tmp[1] == ' ')
+					str_truncate(str, str_len(str)-1);
 				str_append_c(str, ';');
 			}