From 8fbcc6b4cdeed1ad119c28327a0f4f0a579cd24b Mon Sep 17 00:00:00 2001
From: Calin Juravle <calin@google.com>
Date: Tue, 18 Feb 2014 19:08:39 +0000
Subject: Fixed a possible infinite loop in JsonReader#skipValue()

Bug: https://code.google.com/p/android/issues/detail?id=65846

Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
---
 core/java/android/util/JsonReader.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'core/java/android/util')

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 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();
-- 
cgit v1.1