diff options
| author | Anthony Green <green@trip.cygnus.com> | 1999-11-07 08:30:31 +0000 |
|---|---|---|
| committer | Anthony Green <green@gcc.gnu.org> | 1999-11-07 08:30:31 +0000 |
| commit | a21d0597666aa3c801f70ad24962543a97276ca9 (patch) | |
| tree | b06c0ea4832a961f7d530839fbda063f08ac1992 /libjava/java/util | |
| parent | 309ca067d42a680b3d9f8a55c697469f1d92d04a (diff) | |
| download | gcc-a21d0597666aa3c801f70ad24962543a97276ca9.zip gcc-a21d0597666aa3c801f70ad24962543a97276ca9.tar.gz gcc-a21d0597666aa3c801f70ad24962543a97276ca9.tar.bz2 | |
ZipFile.java: Compute the offset of the ZipEntry data correctly.
* java/util/zip/ZipFile.java: Compute the offset of the ZipEntry
data correctly.
From-SVN: r30439
Diffstat (limited to 'libjava/java/util')
| -rw-r--r-- | libjava/java/util/zip/ZipFile.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index 1b0ebce..5eabb12 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -122,10 +122,13 @@ public class ZipFile implements ZipConstants public InputStream getInputStream(ZipEntry ze) throws IOException { byte[] buffer = new byte[(int) ze.getSize()]; - int data_offset = ZipConstants.LOCAL_FILE_HEADER_SIZE + name.length(); - if (ze.extra != null) - data_offset += ze.extra.length; - file.seek(ze.relativeOffset + data_offset); + + /* Read the size of the extra field, and skip to the start of the + data. */ + file.seek (ze.relativeOffset + ZipConstants.LOCAL_FILE_HEADER_SIZE - 2); + int extraFieldLength = readu2(); + file.skipBytes (ze.getName().length() + extraFieldLength); + file.readFully(buffer); InputStream is = new ByteArrayInputStream (buffer); |