From: Aki Tuomi Date: Thu, 24 May 2018 17:14:08 +0000 (+0300) Subject: lib-mail: message_header_decode_encoded - ensure num is QCOUNT X-Git-Tag: 2.3.11.2~435 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83f71dc3f13cca35c37e0353006ae566221c4e29;p=thirdparty%2Fdovecot%2Fcore.git lib-mail: message_header_decode_encoded - ensure num is QCOUNT Satisifies static analyzers --- diff --git a/src/lib-mail/message-header-decode.c b/src/lib-mail/message-header-decode.c index 100560e93e..18f6ca2585 100644 --- a/src/lib-mail/message-header-decode.c +++ b/src/lib-mail/message-header-decode.c @@ -24,11 +24,14 @@ message_header_decode_encoded(const unsigned char *data, size_t size, break; } } + if (i+1 >= size || data[i+1] != '=') { /* invalid block */ return 0; } + i_assert(num == QCOUNT); + buffer_append(decodebuf, data, start_pos[0]); buffer_append_c(decodebuf, '\0'); *charsetlen_r = decodebuf->used;