rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[sfnt] Avoid sanitizer warning (#57286). 

* src/sfnt/ttcmap.c (tt_face_build_cmaps): Avoid possible `NULL +
offset' computation.
Tag `table' as `const'.
This commit is contained in:
Ben Wagner 2019-11-23 10:54:51 +01:00 committed by Werner Lemberg
parent 2d1d60aac6
commit 3cb7b3f7cb
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2019-11-23 Ben Wagner <bungeman@google.com>
[sfnt] Avoid sanitizer warning (#57286).
* src/sfnt/ttcmap.c (tt_face_build_cmaps): Avoid possible `NULL +
offset' computation.
Tag `table' as `const'.
2019-11-23 John Stracke <jstracke@Google.com>
Werner Lemberg <wl@gnu.org>

9
src/sfnt/ttcmap.c
View File

@ -3764,16 +3764,16 @@
FT_LOCAL_DEF( FT_Error )
tt_face_build_cmaps( TT_Face face )
{
FT_Byte* table = face->cmap_table;
FT_Byte* limit = table + face->cmap_size;
FT_Byte* const table = face->cmap_table;
FT_Byte* limit;
FT_UInt volatile num_cmaps;
FT_Byte* volatile p = table;
FT_Byte* volatile p = table;
FT_Library library = FT_FACE_LIBRARY( face );
FT_UNUSED( library );
if ( !p || p + 4 > limit )
if ( !p || face->cmap_size < 4 )
return FT_THROW( Invalid_Table );
/* only recognize format 0 */
@ -3786,6 +3786,7 @@
}
num_cmaps = TT_NEXT_USHORT( p );
limit = table + face->cmap_size;
for ( ; num_cmaps > 0 && p + 8 <= limit; num_cmaps-- )
{