summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-10-01 21:31:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-01 21:31:30 +0000
commita0f57f03512611f0c734d1cf00602f5c08bc593d (patch)
treef11ef1071d3d7af3857da25d1541c8937c9d6fbd
parent213ea54a76332b3d0aef0de134c669ebc420cf33 (diff)
parent81e81ce7aa930332cbc35d06809b11b6d8fe2251 (diff)
downloadlibcore-a0f57f03512611f0c734d1cf00602f5c08bc593d.zip
libcore-a0f57f03512611f0c734d1cf00602f5c08bc593d.tar.gz
libcore-a0f57f03512611f0c734d1cf00602f5c08bc593d.tar.bz2
Merge "ZipFile: fix comparison for offset" into klp-dev
-rw-r--r--luni/src/main/java/java/util/zip/ZipFile.java4
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;
}