Bug 4515: regression after CVE-2016-4554 patch

diff --git a/src/mime_header.cc b/src/mime_header.cc
index f2688b0311b06a4d6afecc1675615e8cec90fffe..b26b2f5f5f8562741c30de71fa1e3c855ca91644 100644 (file)
--- 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;