diff options
Diffstat (limited to 'gcc/java')
-rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/java/jcf-io.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 6cece34..94edcdf 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2012-07-05 Uros Bizjak <ubizjak@gmail.com> + + * jcf-io.c (read_zip_member): Initialize d_stream. + 2012-05-31 Steven Bosscher <steven@gcc.gnu.org> * resource.c: Do not include output.h. @@ -658,7 +662,7 @@ (predefined_filenames): Declare. (add_predefined_file): Use it. (predefined_filename_p): Likewise. - (java_parse_file): Adjust for new type of current_file_list. * + (java_parse_file): Adjust for new type of current_file_list. 2010-05-25 Jakub Jelinek <jakub@redhat.com> diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index c50ec49..0fe30b3 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -202,9 +202,7 @@ read_zip_member (JCF *jcf, ZipDirectory *zipd, ZipFile *zipf) { char *buffer; z_stream d_stream; /* decompression stream */ - d_stream.zalloc = (alloc_func) 0; - d_stream.zfree = (free_func) 0; - d_stream.opaque = (voidpf) 0; + memset (&d_stream, 0, sizeof (d_stream)); jcf->buffer = XNEWVEC (unsigned char, zipd->uncompressed_size); d_stream.next_out = jcf->buffer; |