From c07ca2a1b3cb5057b7cb98f5b15c0704374d7a47 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 12 Jun 2018 11:28:55 +0200 Subject: [PATCH] [sfnt] Fix `sizeof' thinko. * src/sfnt/ttcolr.c (tt_face_load_colr, tt_face_palette_set): Don't use `sizeof' for computing array limit. --- ChangeLog | 7 +++++++ src/sfnt/ttcolr.c | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d054628ff..a873cfdc3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-06-12 Werner Lemberg + + [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 Finish CPAL/COLR support (4/4). diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c index 5efdc1038..fee484089 100644 --- a/src/sfnt/ttcolr.c +++ b/src/sfnt/ttcolr.c @@ -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 ) {