diff options
| author | Mark Adler <fork@madler.net> | 2022-08-08 17:50:09 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-08-08 18:19:27 +0000 |
| commit | 2969066f73fc67a614144ac09b9f3f5291937fed (patch) | |
| tree | ebaa983e5abc8da56cf251c443f3b840a978ac44 | |
| parent | d387a1b4b199630d76b127fded8edbcfecf5a123 (diff) | |
zlib: Fix extra field processing bug that dereferences NULL state->head.
The recent commit to fix a gzip header extra field processing bug
introduced the new bug fixed here.
(cherry picked from zlib commit 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d)
| -rw-r--r-- | sys/contrib/zlib/inflate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/zlib/inflate.c b/sys/contrib/zlib/inflate.c index 345366eed406..d4b4a0978656 100644 --- a/sys/contrib/zlib/inflate.c +++ b/sys/contrib/zlib/inflate.c @@ -763,10 +763,10 @@ int flush; copy = state->length; if (copy > have) copy = have; if (copy) { - len = state->head->extra_len - state->length; if (state->head != Z_NULL && state->head->extra != Z_NULL && - len < state->head->extra_max) { + (len = state->head->extra_len - state->length) < + state->head->extra_max) { zmemcpy(state->head->extra + len, next, len + copy > state->head->extra_max ? state->head->extra_max - len : copy); |