check for buffer mismatch every boundary parse cycle

vapor · Apr 3, 2017 · 10acbcf · 10acbcf
1 parent 9a7f9b2
commit 10acbcf
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
@@ -43,8 +43,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
@@ -163,6 +163,6 @@ class ParserTests: XCTestCase {
         try parser.multipart.parse(message)
 
         XCTAssertEqual(fields["file"]?.filename, "test.txt")
-        XCTAssertEqual("---this is a test", fields["file"]?.part.body.string)
+        XCTAssertEqual("---this is a test", fields["file"]?.part.body.makeString())
     }
 }