Merge pull request #1321 from norio-nomura/escape-solidus

swift-ci · web-flow · commit 53e69218ae1f · 2017-11-16T01:49:55.000-08:00
diff --git a/Foundation/JSONSerialization.swift b/Foundation/JSONSerialization.swift
@@ -403,7 +403,8 @@ private struct JSONWriter {
                     writer("\\\"") // U+0022 quotation mark
                 case "\\":
                     writer("\\\\") // U+005C reverse solidus
-                // U+002F solidus not escaped
+                case "/":
+                    writer("\\/") // U+002F solidus
                 case "\u{8}":
                     writer("\\b") // U+0008 backspace
                 case "\u{c}":
diff --git a/TestFoundation/TestJSONSerialization.swift b/TestFoundation/TestJSONSerialization.swift
@@ -1316,6 +1316,9 @@ extension TestJSONSerialization {
         
         json = ["i\u{1f}"]
         XCTAssertEqual(try trySerialize(json), "[\"i\\u001f\"]")
+
+        json = ["j/"]
+        XCTAssertEqual(try trySerialize(json), "[\"j\\/\"]")
     }
 
     /* These are a programming error and should not be done

Original file line number	Diff line number	Diff line change
`@@ -1316,6 +1316,9 @@ extension TestJSONSerialization {`
`1316`	`1316`
`1317`	`1317`	`json = ["i\u{1f}"]`
`1318`	`1318`	`XCTAssertEqual(try trySerialize(json), "[\"i\\u001f\"]")`
	`1319`	`+`
	`1320`	`+ json = ["j/"]`
	`1321`	`+ XCTAssertEqual(try trySerialize(json), "[\"j\\/\"]")`
`1319`	`1322`	`}`
`1320`	`1323`
`1321`	`1324`	`/* These are a programming error and should not be done`