From 76d21e3004493d4cf0c9f61b4771bbf2ffe4395d Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Wed, 18 May 2016 21:41:49 +0300
Subject: [PATCH] lib-imap-storage: Don't sort uninitialized array on invalid
 header list.

---
 src/lib-imap-storage/imap-msgpart.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib-imap-storage/imap-msgpart.c b/src/lib-imap-storage/imap-msgpart.c
index aa9579039e..aa1698231c 100644
--- a/src/lib-imap-storage/imap-msgpart.c
+++ b/src/lib-imap-storage/imap-msgpart.c
@@ -166,13 +166,12 @@ imap_msgpart_get_header_fields(pool_t pool, const char *header_list,
 			value = p_strdup(pool, t_str_ucase(value));
 			array_append(fields, &value, 1);
 		}
+		/* istream-header-filter requires headers to be sorted */
+		array_sort(fields, i_strcasecmp_p);
 	} else {
 		result = -1;
 	}
 
-	/* istream-header-filter requires headers to be sorted */
-	array_sort(fields, i_strcasecmp_p);
-
 	imap_parser_unref(&parser);
 	i_stream_unref(&input);
 	return result;