dovecot-2.2: imap: GETMETADATA wasn't working correctly if optio...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/f64810b00b7f
changeset: 17076:f64810b00b7f
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Dec 19 23:07:15 2013 +0200
description:
imap: GETMETADATA wasn't working correctly if options parameter wasn't specified.

diffstat:

 src/imap/cmd-getmetadata.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r cded53530a9f -r f64810b00b7f src/imap/cmd-getmetadata.c
--- a/src/imap/cmd-getmetadata.c	Thu Dec 19 23:04:55 2013 +0200
+++ b/src/imap/cmd-getmetadata.c	Thu Dec 19 23:07:15 2013 +0200
@@ -344,18 +344,19 @@
 	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;