aboutsummaryrefslogtreecommitdiff
path: root/dep/zlib/deflate.c
diff options
context:
space:
mode:
authorNayd <dnpd.dd@gmail.com>2014-12-24 17:45:29 +0000
committerNayd <dnpd.dd@gmail.com>2014-12-24 17:45:29 +0000
commit09f57db03d352a12d18d06a9c1616045f233dc4d (patch)
tree42859cfd2326884b3325345b96f21b2cb1136ebb /dep/zlib/deflate.c
parent33a492e822425506884f5ca3d3baef8d5d7d94d7 (diff)
Dep/zlib: Update zlib from version 1.2.7 to 1.2.8
"Version 1.2.8 fixes a very rare bug in decompression. All users are encouraged to upgrade immediately. Version 1.2.8 also has these improvements: Add new inflateGetDictionary() function Fix bug where gzopen() immediately followed by gzclose() would write an empty file instead of an empty gzip stream. Fix bug in gzclose() when gzwrite() runs out of memory"
Diffstat (limited to 'dep/zlib/deflate.c')
-rw-r--r--dep/zlib/deflate.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/dep/zlib/deflate.c b/dep/zlib/deflate.c
index 9e4c2cbc8af..696957705b7 100644
--- a/dep/zlib/deflate.c
+++ b/dep/zlib/deflate.c
@@ -1,5 +1,5 @@
/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler
+ * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -52,7 +52,7 @@
#include "deflate.h"
const char deflate_copyright[] =
- " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler ";
+ " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler ";
/*
If you use the zlib library in a product, an acknowledgment is welcome
in the documentation of your product. If for some reason you cannot
@@ -305,7 +305,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
s->pending_buf == Z_NULL) {
s->status = FINISH_STATE;
- strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
+ strm->msg = ERR_MSG(Z_MEM_ERROR);
deflateEnd (strm);
return Z_MEM_ERROR;
}
@@ -329,7 +329,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
uInt str, n;
int wrap;
unsigned avail;
- unsigned char *next;
+ z_const unsigned char *next;
if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL)
return Z_STREAM_ERROR;
@@ -359,7 +359,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
avail = strm->avail_in;
next = strm->next_in;
strm->avail_in = dictLength;
- strm->next_in = (Bytef *)dictionary;
+ strm->next_in = (z_const Bytef *)dictionary;
fill_window(s);
while (s->lookahead >= MIN_MATCH) {
str = s->strstart;
@@ -513,6 +513,8 @@ int ZEXPORT deflateParams(strm, level, strategy)
strm->total_in != 0) {
/* Flush the last buffer: */
err = deflate(strm, Z_BLOCK);
+ if (err == Z_BUF_ERROR && s->pending == 0)
+ err = Z_OK;
}
if (s->level != level) {
s->level = level;