mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2024-12-20 08:18:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ZipInputStream.java (getNextEntry): When reading file headers, don't include `size' in the skip call.

Browse Source 
* java/util/zip/ZipInputStream.java (getNextEntry): When reading
	file headers, don't include `size' in the skip call.

From-SVN: r33850
This commit is contained in:
Tom Tromey 2000-05-11 17:05:03 +00:00 committed by Tom Tromey
parent f19c9228fc
commit 839ba6c895
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2000-05-11 Tom Tromey <tromey@cygnus.com>
* java/util/zip/ZipInputStream.java (getNextEntry): When reading
file headers, don't include `size' in the skip call.
2000-05-10 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/StringBuffer.java (delete): Call arrayCopy() correctly.

10
libjava/java/util/zip/ZipInputStream.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999 Free Software Foundation
/* Copyright (C) 1999, 2000 Free Software Foundation
This file is part of libgcj.
@ -52,7 +52,13 @@ public class ZipInputStream extends InflaterInputStream implements ZipConstants
int fname_length = readu2();
int extra_length = readu2();
int fcomment_length = readu2();
in.skip(12+fname_length+extra_length+fcomment_length+size);
// `12' is the number of bytes between the comment length
// field and the end of the fixed part of the header:
// 2 bytes for `disk number start'
// 2 bytes for `internal file attributes'
// 4 bytes for `external file attributes'
// 4 bytes for `relative offset of local header'
in.skip(12 + fname_length + extra_length + fcomment_length);
if (in.read() != 'P' || in.read() != 'K')
return null;
code = in.read();