diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-09-02 13:13:45 -0300 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2022-09-06 09:34:43 -0300 |
| commit | d6fae59faa49cedf44960f54b43cb80c6a751a15 (patch) | |
| tree | d5394f881fc99195880d33450fdab5f5f5f75e11 /src/3rdparty/zlib/src/inflate.c | |
| parent | 83e70c315742c5de964a1fc5f973ad087f5894e2 (diff) | |
3rdparty: apply a fix to the last zlib fix
Source:
https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d
Pick-to: 5.15 6.2 6.3 6.4
Change-Id: Ic6547f8247454b47baa8fffd17111732eb074b0a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/3rdparty/zlib/src/inflate.c')
| -rw-r--r-- | src/3rdparty/zlib/src/inflate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/zlib/src/inflate.c b/src/3rdparty/zlib/src/inflate.c index 7a72897492..2a3c4fe984 100644 --- a/src/3rdparty/zlib/src/inflate.c +++ b/src/3rdparty/zlib/src/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); |