minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

Doh. Don't use CPAL or COLR data if tables are missing. 

Reported by Alexei.

* src/sfnt/ttcolr.c (tt_face_get_colr_layer): Return immediately if
`colr' is NULL.

* src/sfnt/ttcpal.c (tt_face_palette_set): Return immediately, if
`cpal' is NULL.
This commit is contained in:
Werner Lemberg 2018-06-19 07:15:21 +02:00
parent a56e4bf7a2
commit 7915fd51f1
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2018-06-19 Werner Lemberg <wl@gnu.org>
Doh. Don't use CPAL or COLR data if tables are missing.
Reported by Alexei.
* src/sfnt/ttcolr.c (tt_face_get_colr_layer): Return immediately if
`colr' is NULL.
* src/sfnt/ttcpal.c (tt_face_palette_set): Return immediately, if
`cpal' is NULL.
2018-06-17 Alexei Podtelezhnikov <apodtele@gmail.com>
[base] Introduce `FT_New_Glyph'.

3
src/sfnt/ttcolr.c
View File

@ -220,6 +220,9 @@
FT_UInt glyph_index;
if ( !colr )
return 0;
if ( !iterator->p )
{
FT_ULong offset;

2
src/sfnt/ttcpal.c
View File

@ -258,7 +258,7 @@
FT_ULong record_offset;
if ( palette_index >= face->palette_data.num_palettes )
if ( !cpal || palette_index >= face->palette_data.num_palettes )
return FT_THROW( Invalid_Argument );
offset = cpal->color_indices + 2 * palette_index;