imapc: Fix crash when untagged FETCH reply doesn't have key-value pairs

The last key with the missing value is just silently ignored.

diff --git a/src/lib-storage/index/imapc/imapc-mailbox.c b/src/lib-storage/index/imapc/imapc-mailbox.c
index 13392cf2e1c4d1a2d46c8afc8f2dd2cfbeb4aedc..57dac046a9071a989702806ddf1bfa347e550dd5 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-mailbox.c
+++ b/src/lib-storage/index/imapc/imapc-mailbox.c
@@ -437,7 +437,8 @@ static void imapc_untagged_fetch(const struct imapc_untagged_reply *reply,
 
        fetch_uid = 0; flags = 0;
        for (i = 0; list[i].type != IMAP_ARG_EOL; i += 2) {
-               if (!imap_arg_get_atom(&list[i], &atom))
+               if (!imap_arg_get_atom(&list[i], &atom) ||
+                   list[i+1].type == IMAP_ARG_EOL)
                        return;
 
                if (strcasecmp(atom, "UID") == 0) {