re PR libgcj/8234 (ZipInputStream chokes when InputStream.read() returns small chunks)

	Fix for PR libgcj/8234:
	* java/util/zip/natInflater.cc (reset): Reset avail_in.
	* java/util/zip/natDeflater.cc (reset): Reset avail_in.

From-SVN: r58205

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f37bd5f4b4a085deb75792051c3c586493110700..16f50b409f338bfdba1fcdf130ba5016da28dd9a 100644 (file)
--- 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 0941143954132505b3336eab562012c1e92cbdb6..23e1201b5436847188d7f913e1cf4459d08e3d77 100644 (file)
--- 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 0568b5e85d3f26fda328b454b4458cf7b05ae0a8..69de6c33560491f3eba8e0f30aff43b86cceaac4 100644 (file)
--- 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;
 }