diff options
| author | Kenny Root <kroot@google.com> | 2013-10-02 09:36:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 09:36:10 -0700 |
| commit | 8e3ffa3d68611664ab5dceb8b918d9528458ea3b (patch) | |
| tree | 4aa4c2a4b7331c9c1ca96a389769a84f991360cc | |
| parent | c1e8aa4b8f60ba83ad74c3387fcef4ed52bfb017 (diff) | |
| parent | a0f57f03512611f0c734d1cf00602f5c08bc593d (diff) | |
| download | libcore-8e3ffa3d68611664ab5dceb8b918d9528458ea3b.zip libcore-8e3ffa3d68611664ab5dceb8b918d9528458ea3b.tar.gz libcore-8e3ffa3d68611664ab5dceb8b918d9528458ea3b.tar.bz2 | |
am a0f57f03: Merge "ZipFile: fix comparison for offset" into klp-dev
* commit 'a0f57f03512611f0c734d1cf00602f5c08bc593d':
ZipFile: fix comparison for offset
| -rw-r--r-- | luni/src/main/java/java/util/zip/ZipFile.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/luni/src/main/java/java/util/zip/ZipFile.java b/luni/src/main/java/java/util/zip/ZipFile.java index 620572d..256ad79 100644 --- a/luni/src/main/java/java/util/zip/ZipFile.java +++ b/luni/src/main/java/java/util/zip/ZipFile.java @@ -457,10 +457,6 @@ public class ZipFile implements Closeable, ZipConstants { @Override public int read(byte[] buffer, int byteOffset, int byteCount) throws IOException { synchronized (sharedRaf) { final long length = endOffset - offset; - if (byteOffset > length) { - throw new IOException("Byte offset is past end of stream: " + byteOffset - + " > " + length); - } if (byteCount > length - byteOffset) { byteCount = (int) length - byteOffset; } |