From ab3342c26f4b7926b1c210df4dd254962b170da1 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 30 Aug 2022 11:32:18 -0300 Subject: 3rdparty/zlib: backport the fix to CVE-2022-37434 Qt isn't known to be affected by this. Pick-to: 5.15 6.2 6.3 6.4 Change-Id: Ic6547f8247454b47baa8fffd171025f5a435a209 Reviewed-by: Volker Hilsheimer --- src/3rdparty/zlib/src/inflate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/3rdparty/zlib/src/inflate.c') diff --git a/src/3rdparty/zlib/src/inflate.c b/src/3rdparty/zlib/src/inflate.c index 7be8c63662..7a72897492 100644 --- a/src/3rdparty/zlib/src/inflate.c +++ b/src/3rdparty/zlib/src/inflate.c @@ -763,9 +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_len - state->length; + state->head->extra != Z_NULL && + len < state->head->extra_max) { zmemcpy(state->head->extra + len, next, len + copy > state->head->extra_max ? state->head->extra_max - len : copy); -- cgit v1.2.3