lib-imap: Make sure str_unescape() won't be writing past allocated memory

The previous commit should already prevent this, but this makes sure it
can't become broken in the future either. It makes the performance a tiny
bit worse, but that's not practically noticeable.

diff --git a/src/lib-imap/imap-parser.c b/src/lib-imap/imap-parser.c
index cf2ffd9de6b9d7938170df153add06f65708e954..98a90928ce1ed8ed8fd6379fbeed1fa825a1a560 100644 (file)
--- a/src/lib-imap/imap-parser.c
+++ b/src/lib-imap/imap-parser.c
@@ -256,10 +256,8 @@ static void imap_parser_save_arg(struct imap_parser *parser,
 
                /* remove the escapes */
                if (parser->str_first_escape >= 0 &&
-                   (parser->flags & IMAP_PARSE_FLAG_NO_UNESCAPE) == 0) {
-                       /* -1 because we skipped the '"' prefix */
-                       (void)str_unescape(str + parser->str_first_escape-1);
-               }
+                   (parser->flags & IMAP_PARSE_FLAG_NO_UNESCAPE) == 0)
+                       (void)str_unescape(str);
                arg->_data.str = str;
                arg->str_len = strlen(str);
                break;