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

2014-02-19 11:15:00 +00:00
parent 60097a9c5a 8fbcc6b4cd
commit f11cc165f4
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();