diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-30 11:32:18 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-08-30 18:27:42 -0300 |
| commit | ab3342c26f4b7926b1c210df4dd254962b170da1 (patch) | |
| tree | 39c39609042d5f3b7ea957cc6c5d35049c130742 /src/3rdparty/zlib/src/inflate.c | |
| parent | 8b947bae72bf661d31372d1bb5e3a16db50fca08 (diff) | |
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 <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/3rdparty/zlib/src/inflate.c')
| -rw-r--r-- | src/3rdparty/zlib/src/inflate.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); |