FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ZipFile.java: Compute the offset of the ZipEntry data correctly.

Browse source 
* java/util/zip/ZipFile.java: Compute the offset of the ZipEntry
        data correctly.

From-SVN: r30439
This commit is contained in:
Anthony Green 1999-11-07 08:30:31 +00:00 • committed by Anthony Green
parent 309ca067d4
commit a21d059766
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libjava/ChangeLog
View file

@ -1,3 +1,8 @@
1999-11-07 Anthony Green <green@trip.cygnus.com>
* java/util/zip/ZipFile.java: Compute the offset of the ZipEntry
data correctly.
1999-11-05 Tom Tromey <tromey@cygnus.com>
* java/lang/natThread.cc (destroy): Removed incorrect comment.

11
libjava/java/util/zip/ZipFile.java
View file

@ -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);