Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"

Browse Source 
* commit '78f522d16e6e0305c61d13d8ca5dd75c792420c8':
  Fixed a possible infinite loop in JsonReader#skipValue()
This commit is contained in:
Calin Juravle
2014-02-19 11:27:58 +00:00
committed by Android Git Automerger
parent 74304f890e 78f522d16e
commit fbd855cb60
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/util/JsonReader.java
View File

@@ -546,6 +546,9 @@ public final class JsonReader implements Closeable {
public void skipValue() throws IOException { public void skipValue() throws IOException {
skipping = true; skipping = true;
try { try {
if (!hasNext() || peek() == JsonToken.END_DOCUMENT) {
throw new IllegalStateException("No element left to skip");
}
int count = 0; int count = 0;
do { do {
JsonToken token = advance(); JsonToken token = advance();