commit f11cc165f4d6e18d79ce013fa2f74fb43e002ac1
author Calin Juravle <calin@google.com> Wed Feb 19 11:15:00 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 19 11:15:00 2014 +0000
tree a23b47d9513882292943b3c189936a9a3b6f2b2d
parent 60097a9c5a7214cb73d0bc966adef767743f8798
parent 8fbcc6b4cdeed1ad119c28327a0f4f0a579cd24b

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

core/java/android/util/JsonReader.java

diff --git a/core/java/android/util/JsonReader.java b/core/java/android/util/JsonReader.java
index f2a86c9..7d1c6c4 100644
--- a/core/java/android/util/JsonReader.java
+++ b/core/java/android/util/JsonReader.java
@@ -546,6 +546,9 @@
     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();