components/pigz/patches/index2.patch
author Petr Nyc <Petr.Nyc@Oracle.COM>
Thu, 21 May 2015 12:36:22 -0700
branchs11u2-sru
changeset 4338 5df7ab8973f7
parent 3431 7c34db1c2816
permissions -rw-r--r--
Added tag 0.175.2.11.0.3.0, S11.2SRU11.3 for changeset d41da420714b

avoid inflateReset2 so that zlib 1.2.3 may be used - developed by Oracle
not submitted upstream

diff -r 510b1b710ac5 pigz.c
--- a/pigz.c
+++ b/pigz.c
@@ -3352,7 +3352,7 @@
         /* got a job -- buffers have all been allocated to the right size.
            deflate and verify the checksum. */
         Trace(("-- uncompressing #%ld", job->seq));
-        if (inflateReset2(&strm, -15) != Z_OK)
+	if (inflateEnd(&strm) != Z_OK || inflateInit2(&strm, -15) != Z_OK)
             bail("stream reset failed: ", strm.msg);
         strm.next_in = job->in->buf;
         strm.avail_in = job->in->len;