check for buffer mismatch every boundary parse cycle (v1)

vapor · Apr 5, 2017 · e13f33a · e13f33a
1 parent 9dcfd47
commit e13f33a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Sources/Multipart/BoundaryParser.swift b/Sources/Multipart/BoundaryParser.swift
@@ -47,8 +47,7 @@ final class BoundaryParser {
             let match = [.hyphen, .hyphen] + boundary
 
             if
-                (buffer.count <= 1 && byte == .hyphen) ||
-                    (buffer.count > 1 && buffer.count < match.count)
+                buffer.count < match.count && match[buffer.count] == byte
             {
                 state = .parsing(buffer: buffer + [byte], trailingHyphenCount: trailingHyphenCount)
                 break main

diff --git a/Tests/FormDataTests/ParserTests.swift b/Tests/FormDataTests/ParserTests.swift
@@ -137,7 +137,7 @@ class ParserTests: XCTestCase {
         try parser.multipart.parse(message)
 
         for i in 1...5 {
-            XCTAssertEqual(fields["field\(i)"]?.part.body.makeString(), "The Quick Brown Fox Jumps Over The Lazy Dog", "Field 'field\(i)' was parsed incorrectly!")
+            XCTAssertEqual(fields["field\(i)"]?.part.body.string, "The Quick Brown Fox Jumps Over The Lazy Dog", "Field 'field\(i)' was parsed incorrectly!")
          }
     }