From 3274c7b373d2dbb80744abd6b73eea7a7e4c2491 Mon Sep 17 00:00:00 2001
From: Krista Grothoff <krista@pep-project.org>
Date: Fri, 6 Oct 2017 15:41:03 +0200
Subject: [PATCH] Merged patch to fix CVE-2017-8825

---
 src/low-level/imf/mailimf.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/low-level/imf/mailimf.c b/src/low-level/imf/mailimf.c
index d58ecae..08bba41 100644
--- a/src/low-level/imf/mailimf.c
+++ b/src/low-level/imf/mailimf.c
@@ -3029,7 +3029,8 @@ static int mailimf_group_parse(const char * message, size_t length,
   struct mailimf_group * group;
   int r;
   int res;
-
+  clist * list;
+  
   cur_token = * indx;
 
   mailbox_list = NULL;
@@ -3056,6 +3057,17 @@ static int mailimf_group_parse(const char * message, size_t length,
       res = r;
       goto free_display_name;
     }
+    list = clist_new();
+    if (list == NULL) {
+      res = MAILIMF_ERROR_MEMORY;
+      goto free_display_name;
+    }
+    mailbox_list = mailimf_mailbox_list_new(list);
+    if (mailbox_list == NULL) {
+      res = MAILIMF_ERROR_MEMORY;
+      clist_free(list);
+      goto free_display_name;
+    }
     break;
   default:
     res = r;