diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-09-18 14:03:19 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-09-18 20:26:55 +0000 |
| commit | 5641a5e1e54c9694a1ba1d462165db9c7c0e529c (patch) | |
| tree | 24fa3c03d190251c5bb7b9fd8c383efdc289498d /src/3rdparty/freetype/src/base/ftstream.c | |
| parent | ffb857e9d0745fdd31bca091333f1120c5857d7b (diff) | |
Upgrade to Freetype 2.13.2
Task-number: QTBUG-117135
Pick-to: 5.15 6.2 6.5 6.5.3 6.6 6.6.0
Change-Id: I2485cf286f590eccee9c4be4bb19559631288fd5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Diffstat (limited to 'src/3rdparty/freetype/src/base/ftstream.c')
| -rw-r--r-- | src/3rdparty/freetype/src/base/ftstream.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/freetype/src/base/ftstream.c b/src/3rdparty/freetype/src/base/ftstream.c index 05c5637578..64826acebe 100644 --- a/src/3rdparty/freetype/src/base/ftstream.c +++ b/src/3rdparty/freetype/src/base/ftstream.c @@ -141,7 +141,9 @@ if ( read_bytes > count ) read_bytes = count; - FT_MEM_COPY( buffer, stream->base + pos, read_bytes ); + /* Allow "reading" zero bytes without UB even if buffer is NULL */ + if ( count ) + FT_MEM_COPY( buffer, stream->base + pos, read_bytes ); } stream->pos = pos + read_bytes; @@ -178,7 +180,9 @@ if ( read_bytes > count ) read_bytes = count; - FT_MEM_COPY( buffer, stream->base + stream->pos, read_bytes ); + /* Allow "reading" zero bytes without UB even if buffer is NULL */ + if ( count ) + FT_MEM_COPY( buffer, stream->base + stream->pos, read_bytes ); } stream->pos += read_bytes; |