components/pigz/patches/index2.patch
branchs11u2-sru
changeset 3431 7c34db1c2816
equal deleted inserted replaced
3430:7e3f6b08023d 3431:7c34db1c2816
       
     1 avoid inflateReset2 so that zlib 1.2.3 may be used - developed by Oracle
       
     2 not submitted upstream
       
     3 
       
     4 diff -r 510b1b710ac5 pigz.c
       
     5 --- a/pigz.c
       
     6 +++ b/pigz.c
       
     7 @@ -3352,7 +3352,7 @@
       
     8          /* got a job -- buffers have all been allocated to the right size.
       
     9             deflate and verify the checksum. */
       
    10          Trace(("-- uncompressing #%ld", job->seq));
       
    11 -        if (inflateReset2(&strm, -15) != Z_OK)
       
    12 +	if (inflateEnd(&strm) != Z_OK || inflateInit2(&strm, -15) != Z_OK)
       
    13              bail("stream reset failed: ", strm.msg);
       
    14          strm.next_in = job->in->buf;
       
    15          strm.avail_in = job->in->len;