diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-02-27 17:17:16 +0100 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-03-01 06:37:31 +0100 |
| commit | 18aa3309a4e4b5a874298af1243095db9aa207d3 (patch) | |
| tree | 67135719384c90e0b563f5c5a519b63971722b37 /src/3rdparty/freetype/src/gzip/inflate.c | |
| parent | a6edf9cbe5bd1d1c6bc08733f97fc07812126bde (diff) | |
Update to Freetype 2.13.0
Also adds a file to patches which is a required modification
to the update in order to make it compile.
Pick-to: 5.15 6.2 6.4 6.4.3 6.5
Fixes: QTBUG-111536
Change-Id: Iaabc1b7736cfd98217a8aff2b7f9bc65402d0451
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/3rdparty/freetype/src/gzip/inflate.c')
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/inflate.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/3rdparty/freetype/src/gzip/inflate.c b/src/3rdparty/freetype/src/gzip/inflate.c index 5bf5b815e5..5117e2e26a 100644 --- a/src/3rdparty/freetype/src/gzip/inflate.c +++ b/src/3rdparty/freetype/src/gzip/inflate.c @@ -170,6 +170,8 @@ int ZEXPORT inflateReset2( /* extract wrap request from windowBits parameter */ if (windowBits < 0) { + if (windowBits < -15) + return Z_STREAM_ERROR; wrap = 0; windowBits = -windowBits; } @@ -239,6 +241,8 @@ int ZEXPORT inflateInit2_( return ret; } +#ifndef Z_FREETYPE + int ZEXPORT inflateInit_( z_streamp strm, const char *version, @@ -247,8 +251,6 @@ int ZEXPORT inflateInit_( return inflateInit2_(strm, DEF_WBITS, version, stream_size); } -#ifndef Z_FREETYPE - int ZEXPORT inflatePrime( z_streamp strm, int bits, @@ -770,8 +772,9 @@ int ZEXPORT inflate( if (copy > have) copy = have; if (copy) { 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_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); @@ -1479,8 +1482,6 @@ int ZEXPORT inflateSync( return Z_OK; } -#endif /* !Z_FREETYPE */ - /* Returns true if inflate is currently at the end of a block generated by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP @@ -1499,8 +1500,6 @@ int ZEXPORT inflateSyncPoint( return state->mode == STORED && state->bits == 0; } -#ifndef Z_FREETYPE - int ZEXPORT inflateCopy( z_streamp dest, z_streamp source) @@ -1548,8 +1547,6 @@ int ZEXPORT inflateCopy( return Z_OK; } -#endif /* !Z_FREETYPE */ - int ZEXPORT inflateUndermine( z_streamp strm, int subvert) @@ -1583,8 +1580,6 @@ int ZEXPORT inflateValidate( return Z_OK; } -#ifndef Z_FREETYPE - long ZEXPORT inflateMark( z_streamp strm) { |