Fix and test header factory

zendframework · Jan 13, 2019 · 16220f4 · 16220f4
1 parent d4e39ed
commit 16220f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/Headers.php b/src/Headers.php
@@ -90,12 +90,10 @@ public static function fromString($string)
 
             if (preg_match("/^[ \t][^\r\n]*$/", $line, $matches)) {
                 // continuation: append to current line
-                if (! isset($current['line'])) {
-                    $current['line'] = '';
+                if (isset($current['line'])) {
+                    $current['line'] .= trim($line);
+                    continue;
                 }
-
-                $current['line'] .= trim($line);
-                continue;
             }
 
             // Line does not match header format!

diff --git a/test/HeadersTest.php b/test/HeadersTest.php
@@ -315,4 +315,10 @@ public function testCRLFAttack()
         $this->expectException(RuntimeException::class);
         Headers::fromString("Fake: foo-bar\r\n\r\nevilContent");
     }
+
+    public function testHeadersFromStringFactoryWithNoCurrentLineShouldThrowException()
+    {
+        $this->expectException(RuntimeException::class);
+        Headers::fromString(" Fake foo\r\n -bar");
+    }
 }