diff options
| author | Calin Juravle <calin@google.com> | 2014-02-19 11:27:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-19 11:27:58 +0000 |
| commit | fbd855cb60fc3b7e219ead013511a51d17a4482d (patch) | |
| tree | 2cbbff9dd1b3621aa336b7a6a1ecda68c82a5f8d /core/java/android | |
| parent | 74304f890e7341d9bb8a6fdadd9e5f4dda60a246 (diff) | |
| parent | 78f522d16e6e0305c61d13d8ca5dd75c792420c8 (diff) | |
am 78f522d1: am 7a4172d1: am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit '78f522d16e6e0305c61d13d8ca5dd75c792420c8':
Fixed a possible infinite loop in JsonReader#skipValue()
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/util/JsonReader.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/util/JsonReader.java b/core/java/android/util/JsonReader.java index f2a86c969368..7d1c6c4918db 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(); |