summaryrefslogtreecommitdiff
path: root/inflate.c
diff options
context:
space:
mode:
authorAdenilson Cavalcanti <adenilson.cavalcanti@arm.com>2017-08-31 21:10:52 +0000
committerCommit Bot <commit-bot@chromium.org>2017-08-31 21:10:52 +0000
commit7ac7e196554587b65087cdfa54c5e1deffba6984 (patch)
treee7db6c22270c6c5afafb10e4512eb3d561f37718 /inflate.c
parent89ba83e44a237664d09f831c67d1909f61ea0224 (diff)
downloadzlib-7ac7e196554587b65087cdfa54c5e1deffba6984.tar.gz
Zlib patch: prevent uninitialized use of state->check
No need to call the Adler32 checksum function, just set the struct field to the expected value. Upstream bug: madler/zlib#245 Bug: chromium:697481 Change-Id: Ib972cc2507c8e7ca0b0b48464db33880ef960fb8 Reviewed-on: https://chromium-review.googlesource.com/644505 Commit-Queue: Adenilson Cavalcanti <cavalcantii@chromium.org> Reviewed-by: Mike Klein <mtklein@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#498998} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: f4b484415281f09d0bbc0880f5d41dbdde96c209
Diffstat (limited to 'inflate.c')
-rw-r--r--inflate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/inflate.c b/inflate.c
index 69b769a..cc38b98 100644
--- a/inflate.c
+++ b/inflate.c
@@ -228,7 +228,8 @@ int stream_size;
state->strm = strm;
state->window = Z_NULL;
state->mode = HEAD; /* to pass state test in inflateReset2() */
- state->check = adler32(0L, Z_NULL, 0);
+ /* 1L is the result of adler32() on zero length data */
+ state->check = 1L;
ret = inflateReset2(strm, windowBits);
if (ret != Z_OK) {
ZFREE(strm, state);