From 79fbcdc939b5d515218187a0d5f2526fb632075a Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Fri, 9 Sep 2011 23:24:02 -0700 Subject: zlib 1.2.2 --- contrib/minizip/unzip.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'contrib/minizip/unzip.c') diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index e804a2a..e14de9e 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c @@ -1,5 +1,5 @@ /* unzip.c -- IO for uncompress .zip files using zlib - Version 1.01c, August 23th, 2004 + Version 1.01d, September 22th, 2004 Copyright (C) 1998-2004 Gilles Vollant @@ -1250,10 +1250,12 @@ extern int ZEXPORT unzReadCurrentFile (file, buf, len) pfile_in_zip_read_info->stream.avail_out = (uInt)pfile_in_zip_read_info->rest_read_uncompressed; - if ((len>pfile_in_zip_read_info->rest_read_compressed) && - (pfile_in_zip_read_info->raw)) + if ((len>pfile_in_zip_read_info->rest_read_compressed+ + pfile_in_zip_read_info->stream.avail_in) && + (pfile_in_zip_read_info->raw)) pfile_in_zip_read_info->stream.avail_out = - (uInt)pfile_in_zip_read_info->rest_read_compressed; + (uInt)pfile_in_zip_read_info->rest_read_compressed+ + pfile_in_zip_read_info->stream.avail_in; while (pfile_in_zip_read_info->stream.avail_out>0) { -- cgit v1.2.3-55-g6feb