diff options
| author | Mark Adler <fork@madler.net> | 2022-10-06 15:49:04 -0700 |
|---|---|---|
| committer | Mark Adler <fork@madler.net> | 2022-10-06 20:43:18 -0700 |
| commit | 138c93cffb76f5c24e4ae6e81e6210428856f825 (patch) | |
| tree | 04ed18dcd05ee70c840c12769a75049e8a729267 /contrib | |
| parent | 9b291c9f013f99ad494ffecf4295cb2f594a18e3 (diff) | |
| download | zlib-138c93cffb76f5c24e4ae6e81e6210428856f825.tar.gz | |
Security and warning fixes for minizip. [gvollant]
Remove unused code and unnecessary test for free().
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/minizip/unzip.c | 4 | ||||
| -rw-r--r-- | contrib/minizip/zip.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index 5e12e47..3036b47 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c @@ -112,7 +112,7 @@ # define ALLOC(size) (malloc(size)) #endif #ifndef TRYFREE -# define TRYFREE(p) {if (p) free(p);} +# define TRYFREE(p) { free(p);} #endif #define SIZECENTRALDIRITEM (0x2e) @@ -1566,6 +1566,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, pfile_in_zip_read_info->stream_initialised=Z_BZIP2ED; else { + TRYFREE(pfile_in_zip_read_info->read_buffer); TRYFREE(pfile_in_zip_read_info); return err; } @@ -1586,6 +1587,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, pfile_in_zip_read_info->stream_initialised=Z_DEFLATED; else { + TRYFREE(pfile_in_zip_read_info->read_buffer); TRYFREE(pfile_in_zip_read_info); return err; } diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c index 4e611e1..66d693f 100644 --- a/contrib/minizip/zip.c +++ b/contrib/minizip/zip.c @@ -1471,11 +1471,6 @@ extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned in { uLong uTotalOutBefore = zi->ci.stream.total_out; err=deflate(&zi->ci.stream, Z_NO_FLUSH); - if(uTotalOutBefore > zi->ci.stream.total_out) - { - int bBreak = 0; - bBreak++; - } zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ; } @@ -1959,7 +1954,7 @@ extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHe int retVal = ZIP_OK; - if(pData == NULL || *dataLen < 4) + if(pData == NULL || dataLen == NULL || *dataLen < 4) return ZIP_PARAMERROR; pNewHeader = (char*)ALLOC((unsigned)*dataLen); |