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

[sfnt] Fix `sizeof' thinko. 

* src/sfnt/ttcolr.c (tt_face_load_colr, tt_face_palette_set): Don't
use `sizeof' for computing array limit.
This commit is contained in:
Werner Lemberg 2018-06-12 11:28:55 +02:00
parent 22d1be3f2c
commit c07ca2a1b3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2018-06-12 Werner Lemberg <wl@gnu.org>
[sfnt] Fix `sizeof' thinko.
* src/sfnt/ttcolr.c (tt_face_load_colr, tt_face_palette_set): Don't
use `sizeof' for computing array limit.
2018-06-12 Werner Lemberg <wl@gnu.org>
Finish CPAL/COLR support (4/4).

9
src/sfnt/ttcolr.c
View File

@ -227,7 +227,7 @@
p = cpal_table + type_offset;
q = array;
limit = q + face->palette_data.num_palettes * sizeof ( FT_UShort );
limit = q + face->palette_data.num_palettes;
while ( q < limit )
*q++ = FT_NEXT_USHORT( p );
@ -248,7 +248,7 @@
p = cpal_table + label_offset;
q = array;
limit = q + face->palette_data.num_palettes * sizeof ( FT_UShort );
limit = q + face->palette_data.num_palettes;
while ( q < limit )
*q++ = FT_NEXT_USHORT( p );
@ -269,8 +269,7 @@
p = cpal_table + entry_label_offset;
q = array;
limit = q + face->palette_data.num_palette_entries *
sizeof ( FT_UShort );
limit = q + face->palette_data.num_palette_entries;
while ( q < limit )
*q++ = FT_NEXT_USHORT( p );
@ -459,7 +458,7 @@
p = cpal->colors + COLOR_SIZE * FT_PEEK_USHORT( offset );
q = face->palette;
limit = q + face->palette_data.num_palette_entries * sizeof ( FT_Color );
limit = q + face->palette_data.num_palette_entries;
while ( q < limit )
{