From 315b65915ca4cf7240373ba9bee5439f1a55b66f Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 16 Oct 2002 14:58:15 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 6 ++++++ libjava/java/util/zip/natDeflater.cc | 1 + libjava/java/util/zip/natInflater.cc | 1 + 3 files changed, 8 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f37bd5f4b4a..16f50b409f3 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-10-15 Tom Tromey + + 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 * 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 09411439541..23e1201b543 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 0568b5e85d3..69de6c33560 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; } -- 2.30.2