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

Merge pull request #166 from square/jwilson.0602.invalid_escapes

Browse Source 
Fail on invalid escapes.
This commit is contained in:
Jake Wharton
2016-06-02 10:12:59 -04:00
parent b81d202093 14549725ef
commit a9d73f27d8
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1081,7 +1081,10 @@ final class BufferedSourceJsonReader extends JsonReader {
case '\'':
case '"':
case '\\':
return (char) escaped;
default:
if (!lenient) throw syntaxError("Invalid escape sequence: \\" + (char) escaped);
return (char) escaped;
}
}

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

@@ -1771,6 +1771,24 @@ public final class BufferedSourceJsonReaderTest {
}
}
@Test public void invalidEscape() throws IOException {
JsonReader reader = newReader("[\"str\\ing\"]");
reader.beginArray();
try {
reader.nextString();
fail();
} catch (IOException expected) {
assertThat(expected).hasMessage("Invalid escape sequence: \\i at path $[0]");
}
}
@Test public void lenientInvalidEscape() throws IOException {
JsonReader reader = newReader("[\"str\\ing\"]");
reader.setLenient(true);
reader.beginArray();
assertThat(reader.nextString()).isEqualTo("string");
}
@Test public void selectName() throws IOException {
JsonReader.Options abc = JsonReader.Options.of("a", "b", "c");