aboutsummaryrefslogtreecommitdiff
path: root/compress.c
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2014-04-25 21:52:19 -0700
committerMark Adler <madler@alumni.caltech.edu>2014-04-26 08:08:12 -0700
commitf898bbed8991fb2220940d19d70803cc68697b60 (patch)
treee16aa1b3c7956ef02f6c6367bc0410f231097980 /compress.c
parent72c70060d8312cff06754779188d8adeb974f18c (diff)
downloadzlib-f898bbed8991fb2220940d19d70803cc68697b60.tar.gz
zlib-f898bbed8991fb2220940d19d70803cc68697b60.tar.bz2
zlib-f898bbed8991fb2220940d19d70803cc68697b60.zip
Fix compress() to work on lengths more than a maximum unsigned.
Diffstat (limited to 'compress.c')
-rw-r--r--compress.c42
1 files changed, 24 insertions, 18 deletions
diff --git a/compress.c b/compress.c
index 6e97626..85a96df 100644
--- a/compress.c
+++ b/compress.c
@@ -1,5 +1,5 @@
1/* compress.c -- compress a memory buffer 1/* compress.c -- compress a memory buffer
2 * Copyright (C) 1995-2005 Jean-loup Gailly. 2 * Copyright (C) 1995-2005, 2014 Jean-loup Gailly, Mark Adler
3 * For conditions of distribution and use, see copyright notice in zlib.h 3 * For conditions of distribution and use, see copyright notice in zlib.h
4 */ 4 */
5 5
@@ -28,16 +28,11 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
28{ 28{
29 z_stream stream; 29 z_stream stream;
30 int err; 30 int err;
31 const uInt max = -1;
32 uLong left;
31 33
32 stream.next_in = (z_const Bytef *)source; 34 left = *destLen;
33 stream.avail_in = (uInt)sourceLen; 35 *destLen = 0;
34#ifdef MAXSEG_64K
35 /* Check for source > 64K on 16-bit machine: */
36 if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
37#endif
38 stream.next_out = dest;
39 stream.avail_out = (uInt)*destLen;
40 if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
41 36
42 stream.zalloc = (alloc_func)0; 37 stream.zalloc = (alloc_func)0;
43 stream.zfree = (free_func)0; 38 stream.zfree = (free_func)0;
@@ -46,15 +41,26 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
46 err = deflateInit(&stream, level); 41 err = deflateInit(&stream, level);
47 if (err != Z_OK) return err; 42 if (err != Z_OK) return err;
48 43
49 err = deflate(&stream, Z_FINISH); 44 stream.next_out = dest;
50 if (err != Z_STREAM_END) { 45 stream.avail_out = 0;
51 deflateEnd(&stream); 46 stream.next_in = (z_const Bytef *)source;
52 return err == Z_OK ? Z_BUF_ERROR : err; 47 stream.avail_in = 0;
53 } 48
54 *destLen = stream.total_out; 49 do {
50 if (stream.avail_out == 0) {
51 stream.avail_out = left > (uLong)max ? max : (uInt)left;
52 left -= stream.avail_out;
53 }
54 if (stream.avail_in == 0) {
55 stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
56 sourceLen -= stream.avail_in;
57 }
58 err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
59 } while (err == Z_OK);
55 60
56 err = deflateEnd(&stream); 61 *destLen = stream.total_out;
57 return err; 62 deflateEnd(&stream);
63 return err == Z_STREAM_END ? Z_OK : err;
58} 64}
59 65
60/* =========================================================================== 66/* ===========================================================================