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 dc938863c971d48f7a6f06af25b4352bb35a8d08..225d1a8103a1b658cae79dd4f1821f862cc49a66 100644 (file)
--- a/src/lib-mail/message-address.c
+++ b/src/lib-mail/message-address.c
@@ -358,8 +358,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 {