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

* commit '7a4172d190871c6b17124bf86374304cef727984': Fixed a possible infinite loop in JsonReader#skipValue()
2014-02-19 11:21:58 +00:00
parent 1bf3795798 7a4172d190
commit 78f522d16e
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();