Bug 4515: regression after CVE-2016-4554 patch

diff --git a/src/mime_header.cc b/src/mime_header.cc
index f6ee6da6570aae558a61815f8792b48555d727c1..1936e82ffd796d4c0a19792019b92ea16633c270 100644 (file)
--- a/src/mime_header.cc
+++ b/src/mime_header.cc
@@ -36,10 +36,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;