zlib: updated to version 1.2.11

1 files changed, 49 insertions, 43 deletions

diff --git a/libs/zlib/src/compress.c b/libs/zlib/src/compress.c
index 1541edf08d..e2db404abf 100644
--- a/libs/zlib/src/compress.c
+++ b/libs/zlib/src/compress.c
@@ -1,5 +1,5 @@
 /* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2005 Jean-loup Gailly.
+ * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -19,62 +19,68 @@
    memory, Z_BUF_ERROR if there was not enough room in the output buffer,
    Z_STREAM_ERROR if the level parameter is invalid.
 */
-int ZEXPORT compress2(dest, destLen, source, sourceLen, level)
-Bytef *dest;
-uLongf *destLen;
-const Bytef *source;
-uLong sourceLen;
-int level;
+int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
+    int level;
 {
-	z_stream stream;
-	int err;
+    z_stream stream;
+    int err;
+    const uInt max = (uInt)-1;
+    uLong left;
 
-	stream.next_in = (z_const Bytef *)source;
-	stream.avail_in = (uInt)sourceLen;
-	#ifdef MAXSEG_64K
-	/* Check for source > 64K on 16-bit machine: */
-	if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-	#endif
-	stream.next_out = dest;
-	stream.avail_out = (uInt)*destLen;
-	if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
+    left = *destLen;
+    *destLen = 0;
 
-	stream.zalloc = (alloc_func)0;
-	stream.zfree = (free_func)0;
-	stream.opaque = (voidpf)0;
+    stream.zalloc = (alloc_func)0;
+    stream.zfree = (free_func)0;
+    stream.opaque = (voidpf)0;
 
-	err = deflateInit(&stream, level);
-	if (err != Z_OK) return err;
+    err = deflateInit(&stream, level);
+    if (err != Z_OK) return err;
 
-	err = deflate(&stream, Z_FINISH);
-	if (err != Z_STREAM_END) {
-		deflateEnd(&stream);
-		return err == Z_OK ? Z_BUF_ERROR : err;
-	}
-	*destLen = stream.total_out;
+    stream.next_out = dest;
+    stream.avail_out = 0;
+    stream.next_in = (z_const Bytef *)source;
+    stream.avail_in = 0;
 
-	err = deflateEnd(&stream);
-	return err;
+    do {
+        if (stream.avail_out == 0) {
+            stream.avail_out = left > (uLong)max ? max : (uInt)left;
+            left -= stream.avail_out;
+        }
+        if (stream.avail_in == 0) {
+            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
+            sourceLen -= stream.avail_in;
+        }
+        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
+    } while (err == Z_OK);
+
+    *destLen = stream.total_out;
+    deflateEnd(&stream);
+    return err == Z_STREAM_END ? Z_OK : err;
 }
 
 /* ===========================================================================
  */
-int ZEXPORT compress(dest, destLen, source, sourceLen)
-Bytef *dest;
-uLongf *destLen;
-const Bytef *source;
-uLong sourceLen;
+int ZEXPORT compress (dest, destLen, source, sourceLen)
+    Bytef *dest;
+    uLongf *destLen;
+    const Bytef *source;
+    uLong sourceLen;
 {
-	return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
+    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
 }
 
 /* ===========================================================================
-	  If the default memLevel or windowBits for deflateInit() is changed, then
-	this function needs to be updated.
+     If the default memLevel or windowBits for deflateInit() is changed, then
+   this function needs to be updated.
  */
-uLong ZEXPORT compressBound(sourceLen)
-uLong sourceLen;
+uLong ZEXPORT compressBound (sourceLen)
+    uLong sourceLen;
 {
-	return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
-		(sourceLen >> 25) + 13;
+    return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) +
+           (sourceLen >> 25) + 13;
 }