diff options
| author | Jesse Wilson <jessewilson@google.com> | 2011-07-22 09:01:48 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2011-07-22 09:01:48 -0700 |
| commit | d1ad3c2c3a675c4018f0f43577b203858dad767a (patch) | |
| tree | f47ddcd454fac9d1fa440db081c14b3259914e75 /core | |
| parent | 40c4321df41eec6eba7e5001c7e13e9b7680b1fb (diff) | |
| download | frameworks_base-d1ad3c2c3a675c4018f0f43577b203858dad767a.zip frameworks_base-d1ad3c2c3a675c4018f0f43577b203858dad767a.tar.gz frameworks_base-d1ad3c2c3a675c4018f0f43577b203858dad767a.tar.bz2 | |
Fix benign off-by-one in JsonReader.
The bug would have caused us to call fillBuffer() earlier than
necessary.
Change-Id: Ib0e4e54019394d7085913faf90c495d130e8bb75
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/util/JsonReader.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/util/JsonReader.java b/core/java/android/util/JsonReader.java index f139372..f2a86c9 100644 --- a/core/java/android/util/JsonReader.java +++ b/core/java/android/util/JsonReader.java @@ -740,8 +740,8 @@ public final class JsonReader implements Closeable { limit += total; // if this is the first read, consume an optional byte order mark (BOM) if it exists - if (bufferStartLine == 1 && bufferStartColumn == 1 - && limit > 0 && buffer[0] == '\ufeff') { + if (bufferStartLine == 1 && bufferStartColumn == 1 + && limit > 0 && buffer[0] == '\ufeff') { pos++; bufferStartColumn--; } @@ -852,7 +852,7 @@ public final class JsonReader implements Closeable { private boolean skipTo(String toFind) throws IOException { outer: - for (; pos + toFind.length() < limit || fillBuffer(toFind.length()); pos++) { + for (; pos + toFind.length() <= limit || fillBuffer(toFind.length()); pos++) { for (int c = 0; c < toFind.length(); c++) { if (buffer[pos + c] != toFind.charAt(c)) { continue outer; |