diff options
author | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:26:58 -0700 |
---|---|---|
committer | Mark Adler <madler@alumni.caltech.edu> | 2011-09-09 23:26:58 -0700 |
commit | dc5a43ebfadb6b775f6e64bfeb5a461c66acb394 (patch) | |
tree | 00e122ba59ad883db198dc6adf24d020cac924d3 /inflate.c | |
parent | d004b047838a7e803818b4973a2e39e0ff8c1fa2 (diff) | |
download | zlib-dc5a43ebfadb6b775f6e64bfeb5a461c66acb394.tar.gz zlib-dc5a43ebfadb6b775f6e64bfeb5a461c66acb394.tar.bz2 zlib-dc5a43ebfadb6b775f6e64bfeb5a461c66acb394.zip |
zlib 1.2.3.6v1.2.3.6
Diffstat (limited to 'inflate.c')
-rw-r--r-- | inflate.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -154,7 +154,7 @@ int windowBits; | |||
154 | /* set number of window bits, free window if different */ | 154 | /* set number of window bits, free window if different */ |
155 | if (windowBits && (windowBits < 8 || windowBits > 15)) | 155 | if (windowBits && (windowBits < 8 || windowBits > 15)) |
156 | return Z_STREAM_ERROR; | 156 | return Z_STREAM_ERROR; |
157 | if (state->wbits != windowBits && state->window != Z_NULL) { | 157 | if (state->wbits != (unsigned)windowBits && state->window != Z_NULL) { |
158 | ZFREE(strm, state->window); | 158 | ZFREE(strm, state->window); |
159 | state->window = Z_NULL; | 159 | state->window = Z_NULL; |
160 | } | 160 | } |
@@ -1458,8 +1458,8 @@ int subvert; | |||
1458 | 1458 | ||
1459 | if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; | 1459 | if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; |
1460 | state = (struct inflate_state FAR *)strm->state; | 1460 | state = (struct inflate_state FAR *)strm->state; |
1461 | #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR | ||
1462 | state->sane = !subvert; | 1461 | state->sane = !subvert; |
1462 | #ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR | ||
1463 | return Z_OK; | 1463 | return Z_OK; |
1464 | #else | 1464 | #else |
1465 | state->sane = 1; | 1465 | state->sane = 1; |