diff options
author | Mike Klein <mtklein@chromium.org> | 2017-09-16 00:01:52 +0000 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2017-09-16 00:01:52 +0000 |
commit | 4c5e940681bbc2cda36278c88263f3dfb53e5362 (patch) | |
tree | 6ed686cf81c02d3ff845c156518c0df58d92ff95 /inflate.c | |
parent | 87c47f390b24ee6e7133b11599cb648171a57103 (diff) | |
download | zlib-4c5e940681bbc2cda36278c88263f3dfb53e5362.tar.gz |
Revert "Zlib patch: prevent uninitialized use of state->check"
This reverts commit f4b484415281f09d0bbc0880f5d41dbdde96c209.
Reason for revert: need to revert previous CL, which this depends on (because it added contrib/arm/inflate.c).
Original change's description:
> 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-Commit-Position: refs/heads/master@{#498998}
TBR=scroggo@chromium.org,agl@chromium.org,cavalcantii@chromium.org,npm@chromium.org,cblume@chromium.org,mtklein@chromium.org,adenilson.cavalcanti@arm.com
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: chromium:697481
Change-Id: I12c6ca6867d1d7e97c9f372f2d592ed75d51f093
Reviewed-on: https://chromium-review.googlesource.com/669480
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#502449}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 4e96bed9f68c0d6ae106c1042a3041eafcf59b9a
Diffstat (limited to 'inflate.c')
-rw-r--r-- | inflate.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -228,8 +228,7 @@ int stream_size; state->strm = strm; state->window = Z_NULL; state->mode = HEAD; /* to pass state test in inflateReset2() */ - /* 1L is the result of adler32() on zero length data */ - state->check = 1L; + state->check = adler32(0L, Z_NULL, 0); ret = inflateReset2(strm, windowBits); if (ret != Z_OK) { ZFREE(strm, state); |