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

* commit 'f11cc165f4d6e18d79ce013fa2f74fb43e002ac1': Fixed a possible infinite loop in JsonReader#skipValue()
2014-02-19 03:18:06 -08:00
parent 660a514e80 f11cc165f4
commit 7a4172d190
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/util/JsonReader.java
+++ b/core/java/android/util/JsonReader.java
@@ -546,6 +546,9 @@ public final class JsonReader implements Closeable {
    public void skipValue() throws IOException {
        skipping = true;
        try {
+            if (!hasNext() || peek() == JsonToken.END_DOCUMENT) {
+                throw new IllegalStateException("No element left to skip");
+            }
            int count = 0;
            do {
                JsonToken token = advance();