From acf894b0aa659e2c17f4b9d26afc786aae06072f Mon Sep 17 00:00:00 2001 From: Amos Jeffries Date: Mon, 9 May 2016 00:43:33 +1200 Subject: [PATCH] Bug 4515: regression after CVE-2016-4554 patch --- src/mime_header.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/mime_header.cc b/src/mime_header.cc index d5f0ef110a..e5b2a7a7ad 100644 --- a/src/mime_header.cc +++ b/src/mime_header.cc @@ -66,10 +66,13 @@ mime_get_header_field(const char *mime, const char *name, const char *prefix) debugs(25, 5, "mime_get_header: looking for '" << name << "'"); - for (p = mime; *p; p += strcspn(p, "\n\r")) { - if (strcmp(p, "\r\n\r\n") == 0 || strcmp(p, "\n\n") == 0) + for (p = mime; *p; p += strcspn(p, "\n")) { + if (strcmp(p, "\n\r\n") == 0 || strcmp(p, "\n\n") == 0) return NULL; + if (*p == '\n') + ++p; + if (strncasecmp(p, name, namelen)) continue; -- 2.47.2