diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-11-02 20:02:35 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-11-02 20:02:35 +0000 |
| commit | 3a6ff6347c47d599c8a8b979766c345d6fece841 (patch) | |
| tree | 90163de1e6b727cfe012f66de458f03150d43180 /gcc/java | |
| parent | 67fa160f5195047ed7bae65ec01f47d3482d3816 (diff) | |
| download | gcc-3a6ff6347c47d599c8a8b979766c345d6fece841.tar.gz | |
PR java/33765:
* jcf-parse.c (java_parse_file): Ignore ZIPEMPTYMAGIC files.
* zipfile.h (ZIPEMPTYMAGIC): New define.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129860 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 4 | ||||
| -rw-r--r-- | gcc/java/zipfile.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 587178dd6de..194edc55a78 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2007-11-02 Tom Tromey <tromey@redhat.com> + + PR java/33765: + * jcf-parse.c (java_parse_file): Ignore ZIPEMPTYMAGIC files. + * zipfile.h (ZIPEMPTYMAGIC): New define. + 2007-11-01 Tom Tromey <tromey@redhat.com> * Make-lang.in (java/jcf-dump.o): Depend on zipfile.h. diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index a544163c441..ab2a385e0e1 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1946,6 +1946,10 @@ java_parse_file (int set_yydebug ATTRIBUTE_UNUSED) #endif parse_zip_file_entries (); } + else if (magic == (JCF_u4) ZIPEMPTYMAGIC) + { + /* Ignore an empty input jar. */ + } else { gcc_unreachable (); diff --git a/gcc/java/zipfile.h b/gcc/java/zipfile.h index 39e3a5f221d..d78226a495c 100644 --- a/gcc/java/zipfile.h +++ b/gcc/java/zipfile.h @@ -58,6 +58,7 @@ extern struct ZipFile *SeenZipFiles; #define ZIPDIR_NEXT(ZIPD) \ ((ZipDirectory*)((char*)(ZIPD)+(ZIPD)->direntry_size)) #define ZIPMAGIC 0x504b0304 +#define ZIPEMPTYMAGIC 0x504b0506 extern ZipFile * opendir_in_zip (const char *, int); extern int read_zip_archive (ZipFile *); |