git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jartool.c (extract_jar): Unconditionally read extra data in the entry header... 

* jartool.c (extract_jar): Unconditionally read extra data in the
	entry header; don't read it after the file contents.

From-SVN: r87990
This commit is contained in:
Tom Tromey 2004-09-23 23:40:33 +00:00 committed by Tom Tromey
parent e758023dab
commit 847450b41d
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fastjar/ChangeLog
View File

@ -1,3 +1,8 @@
2004-09-23 Tom Tromey <tromey@redhat.com>
* jartool.c (extract_jar): Unconditionally read extra data in the
entry header; don't read it after the file contents.
2004-08-11 Kelley Cook <kcook@gcc.gnu.org> 2004-08-11 Kelley Cook <kcook@gcc.gnu.org>
PR bootstrap/16164 PR bootstrap/16164

6
fastjar/jartool.c
View File

@ -1805,8 +1805,10 @@ int extract_jar(int fd, char **files, int file_num){
exit(1); exit(1);
} }
if (eflen > 0)
consume(&pbf, eflen);
if(method == 8 || flags & 0x0008){ if(method == 8 || flags & 0x0008){
consume(&pbf, eflen);
inflate_file(&pbf, f_fd, &ze); inflate_file(&pbf, f_fd, &ze);
} else { } else {
@ -1839,8 +1841,6 @@ int extract_jar(int fd, char **files, int file_num){
printf("%d bytes written\n", out_a); printf("%d bytes written\n", out_a);
#endif #endif
} }
consume(&pbf, eflen);
} }
/* if there is a data descriptor left, compare the CRC */ /* if there is a data descriptor left, compare the CRC */