From: Timo Sirainen <tss@iki.fi>
Date: Thu, 19 Dec 2013 21:07:15 +0000 (+0200)
Subject: imap: GETMETADATA wasn't working correctly if options parameter wasn't specified.
X-Git-Tag: 2.2.10~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77b4e728245a1905b1cce68fce9e9b7adf7efc2c;p=thirdparty%2Fdovecot%2Fcore.git

imap: GETMETADATA wasn't working correctly if options parameter wasn't specified.
---

diff --git a/src/imap/cmd-getmetadata.c b/src/imap/cmd-getmetadata.c
index 19d96d8a50..73759e0b47 100644
--- a/src/imap/cmd-getmetadata.c
+++ b/src/imap/cmd-getmetadata.c
@@ -344,18 +344,19 @@ bool cmd_getmetadata(struct client_command_context *cmd)
 	if (imap_arg_get_list(&args[0], &options)) {
 		if (!cmd_getmetadata_parse_options(ctx, options))
 			return TRUE;
+		args++;
 	}
-	if (!imap_arg_get_astring(&args[1], &mailbox)) {
+	if (!imap_arg_get_astring(&args[0], &mailbox)) {
 		client_send_command_error(cmd, "Invalid arguments.");
 		return TRUE;
 	}
-	if (!imap_arg_get_list(&args[2], &entries)) {
-		if (!imap_arg_get_astring(&args[2], &entry_name) ||
-		    !IMAP_ARG_IS_EOL(&args[3])) {
+	if (!imap_arg_get_list(&args[1], &entries)) {
+		if (!imap_arg_get_astring(&args[1], &entry_name) ||
+		    !IMAP_ARG_IS_EOL(&args[2])) {
 			client_send_command_error(cmd, "Invalid arguments.");
 			return TRUE;
 		}
-		entries = args+2;
+		entries = args+1;
 	}
 	if (!imap_metadata_parse_entry_names(ctx, entries))
 		return TRUE;