Commit 315b6591 by Tom Tromey Committed by Tom Tromey

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
parent d09e61b9
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> 2002-10-13 Mark Wielaard <mark@klomp.org>
* mauve-libgcj: Enable Mauve tests that compile now. * mauve-libgcj: Enable Mauve tests that compile now.
......
...@@ -124,6 +124,7 @@ java::util::zip::Deflater::reset () ...@@ -124,6 +124,7 @@ java::util::zip::Deflater::reset ()
z_streamp s = (z_streamp) zstream; z_streamp s = (z_streamp) zstream;
// Just ignore errors. // Just ignore errors.
deflateReset (s); deflateReset (s);
s->avail_in = 0;
flush_flag = 0; flush_flag = 0;
is_finished = false; is_finished = false;
} }
......
...@@ -149,6 +149,7 @@ java::util::zip::Inflater::reset () ...@@ -149,6 +149,7 @@ java::util::zip::Inflater::reset ()
z_streamp s = (z_streamp) zstream; z_streamp s = (z_streamp) zstream;
// Just ignore errors. // Just ignore errors.
inflateReset (s); inflateReset (s);
s->avail_in = 0;
is_finished = false; is_finished = false;
dict_needed = false; dict_needed = false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment