[freetype2] master c07ca2a 6/6: [sfnt] Fix `sizeof' thinko.

[Werner LEMBERG]

branch: master
commit c07ca2a1b3cb5057b7cb98f5b15c0704374d7a47
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [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 d054628..a873cfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2018-06-12  Werner Lemberg  <address@hidden>
 
+       [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  <address@hidden>
+
        Finish CPAL/COLR support (4/4).
 
        * src/sfnt/ttcolr.c (tt_face_find_color): Removed.
diff --git a/src/sfnt/ttcolr.c b/src/sfnt/ttcolr.c
index 5efdc10..fee4840 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 )
     {