fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #211 from square/jwilson.1020.escape_slash

Browse Source 
Don't reject escaped forward slashes.
This commit is contained in:
Jake Wharton
2016-10-20 22:34:00 -04:00
committed by GitHub
parent 22e6991e41 b0e11ebb1c
commit 5467daeff8
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
moshi/src/main/java/com/squareup/moshi/BufferedSourceJsonReader.java
View File

@@ -1073,6 +1073,7 @@ final class BufferedSourceJsonReader extends JsonReader {
case '\'':
case '"':
case '\\':
case '/':
return (char) escaped;
default:

6
moshi/src/test/java/com/squareup/moshi/BufferedSourceJsonReaderTest.java
View File

@@ -1804,6 +1804,12 @@ public final class BufferedSourceJsonReaderTest {
}
}
@Test public void validEscapes() throws IOException {
JsonReader reader = newReader("[\"\\\"\\\\\\/\\b\\f\\n\\r\\t\"]");
reader.beginArray();
assertThat(reader.nextString()).isEqualTo("\"\\/\b\f\n\r\t");
}
@Test public void invalidEscape() throws IOException {
JsonReader reader = newReader("[\"str\\ing\"]");
reader.beginArray();