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.
This commit is contained in:
Mark Adler 2022-08-08 10:50:09 -07:00
parent 22aec0cb0b
commit 1eb7682f84
1 changed files with 2 additions and 2 deletions

View File

@ -763,10 +763,10 @@ int flush;
copy = state->length; copy = state->length;
if (copy > have) copy = have; if (copy > have) copy = have;
if (copy) { if (copy) {
len = state->head->extra_len - state->length;
if (state->head != Z_NULL && if (state->head != Z_NULL &&
state->head->extra != 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, zmemcpy(state->head->extra + len, next,
len + copy > state->head->extra_max ? len + copy > state->head->extra_max ?
state->head->extra_max - len : copy); state->head->extra_max - len : copy);