From: Timo Sirainen <tss@iki.fi>
Date: Thu, 19 Dec 2013 21:04:55 +0000 (+0200)
Subject: imap: SETMETADATA shouldn't assert-crash when entry name is invalid
X-Git-Tag: 2.2.10~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8855b8b57050fe3b6dc3f19283488512fae98648;p=thirdparty%2Fdovecot%2Fcore.git

imap: SETMETADATA shouldn't assert-crash when entry name is invalid
---

diff --git a/src/imap/cmd-setmetadata.c b/src/imap/cmd-setmetadata.c
index 57880ddcca..1a98c81ec9 100644
--- a/src/imap/cmd-setmetadata.c
+++ b/src/imap/cmd-setmetadata.c
@@ -233,7 +233,8 @@ static bool cmd_setmetadata_continue(struct client_command_context *cmd)
 
 	while ((ret = cmd_setmetadata_parse_entryvalue(ctx, &entry, &value)) > 0 &&
 	       entry != NULL) {
-		ret = cmd_setmetadata_entry(ctx, entry, value);
+		ret = ctx->failed ? 1 :
+			cmd_setmetadata_entry(ctx, entry, value);
 		imap_parser_reset(ctx->parser);
 		if (ret <= 0)
 			break;