Merge branch 'master' into patch-1

revdotcom · Jan 19, 2017 · a1ecff0 · a1ecff0
2 parents c0548b6 + 7e85f22
commit a1ecff0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Sources/JSONParser.swift b/Sources/JSONParser.swift
@@ -237,6 +237,7 @@ public struct JSONParser {
             switch input[loc] {
             case Literal.BACKSLASH:
                 loc = (loc + 1)
+                guard loc < input.count else { continue }
                 switch input[loc] {
                 case Literal.DOUBLE_QUOTE: stringDecodingBuffer.append(Literal.DOUBLE_QUOTE)
                 case Literal.BACKSLASH:    stringDecodingBuffer.append(Literal.BACKSLASH)

diff --git a/Tests/FreddyTests/JSONParserTests.swift b/Tests/FreddyTests/JSONParserTests.swift
@@ -482,4 +482,15 @@ class JSONParserTests: XCTestCase {
             }
         }
     }
+
+    func testThatParserRejectsStringEndingInBackslash() {
+        let invalidJSONString = "[\"\\"
+        do {
+            _ = try JSONParser.parse(invalidJSONString)
+        } catch JSONParser.Error.endOfStreamUnexpected {
+            // do nothing - this is the expected error
+        } catch {
+            XCTFail("Unexpected error: \(error)")
+        }
+    }
 }