diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/util/zip/natDeflater.cc | 1 | ||||
| -rw-r--r-- | libjava/java/util/zip/natInflater.cc | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f37bd5f..16f50b4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-10-15 Tom Tromey <tromey@redhat.com> + + Fix for PR libgcj/8234: + * java/util/zip/natInflater.cc (reset): Reset avail_in. + * java/util/zip/natDeflater.cc (reset): Reset avail_in. + 2002-10-13 Mark Wielaard <mark@klomp.org> * mauve-libgcj: Enable Mauve tests that compile now. diff --git a/libjava/java/util/zip/natDeflater.cc b/libjava/java/util/zip/natDeflater.cc index 0941143..23e1201 100644 --- a/libjava/java/util/zip/natDeflater.cc +++ b/libjava/java/util/zip/natDeflater.cc @@ -124,6 +124,7 @@ java::util::zip::Deflater::reset () z_streamp s = (z_streamp) zstream; // Just ignore errors. deflateReset (s); + s->avail_in = 0; flush_flag = 0; is_finished = false; } diff --git a/libjava/java/util/zip/natInflater.cc b/libjava/java/util/zip/natInflater.cc index 0568b5e..69de6c3 100644 --- a/libjava/java/util/zip/natInflater.cc +++ b/libjava/java/util/zip/natInflater.cc @@ -149,6 +149,7 @@ java::util::zip::Inflater::reset () z_streamp s = (z_streamp) zstream; // Just ignore errors. inflateReset (s); + s->avail_in = 0; is_finished = false; dict_needed = false; } |