FETCH BODY[HEADER.FIELDS ...] crashed

--HG--
branch : HEAD

diff --git a/src/imap/imap-fetch-body-section.c b/src/imap/imap-fetch-body-section.c
index 57a51193a3b52b96235bd1ffa145bdcbdd2891db..c68702c6cb9eeb92733f1dcd174d9bf28defec3c 100644 (file)
--- a/src/imap/imap-fetch-body-section.c
+++ b/src/imap/imap-fetch-body-section.c
@@ -242,8 +242,8 @@ static int fetch_header_fields(struct istream *input, const char *section,
        while ((hdr = message_parse_header_next(hdr_ctx)) != NULL) {
                /* see if we want this field.
                   we always want the end-of-headers line */
-               if (!ctx->match_func(ctx->fields, hdr->name, hdr->name_len) &&
-                   !hdr->eoh)
+               if (!hdr->eoh &&
+                   !ctx->match_func(ctx->fields, hdr->name, hdr->name_len))
                        continue;
 
                if (!hdr->continued && !hdr->eoh) {