diff options
Diffstat (limited to 'contrib/minizip/zip.c')
-rw-r--r-- | contrib/minizip/zip.c | 7 |
1 files changed, 1 insertions, 6 deletions
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 | |||
1471 | { | 1471 | { |
1472 | uLong uTotalOutBefore = zi->ci.stream.total_out; | 1472 | uLong uTotalOutBefore = zi->ci.stream.total_out; |
1473 | err=deflate(&zi->ci.stream, Z_NO_FLUSH); | 1473 | err=deflate(&zi->ci.stream, Z_NO_FLUSH); |
1474 | if(uTotalOutBefore > zi->ci.stream.total_out) | ||
1475 | { | ||
1476 | int bBreak = 0; | ||
1477 | bBreak++; | ||
1478 | } | ||
1479 | 1474 | ||
1480 | zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ; | 1475 | zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ; |
1481 | } | 1476 | } |
@@ -1959,7 +1954,7 @@ extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHe | |||
1959 | 1954 | ||
1960 | int retVal = ZIP_OK; | 1955 | int retVal = ZIP_OK; |
1961 | 1956 | ||
1962 | if(pData == NULL || *dataLen < 4) | 1957 | if(pData == NULL || dataLen == NULL || *dataLen < 4) |
1963 | return ZIP_PARAMERROR; | 1958 | return ZIP_PARAMERROR; |
1964 | 1959 | ||
1965 | pNewHeader = (char*)ALLOC((unsigned)*dataLen); | 1960 | pNewHeader = (char*)ALLOC((unsigned)*dataLen); |