diff options
| author | Ebrahim Byagowi <ebrahim@gnu.org> | 2018-03-01 10:27:18 +0330 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 10:27:18 +0330 |
| commit | 7e958646a4a825bfe3aac56ddb96100d68c5592c (patch) | |
| tree | 202f5b80a23721821eaf826006cd720b3ab90b51 | |
| parent | bcf578fefe6d7af0a962329ceb9989ce61ec467d (diff) | |
[CPAL] Fix version checking logic on sanitizer (#851)
| -rw-r--r-- | src/hb-ot-cpal-table.hh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/hb-ot-cpal-table.hh b/src/hb-ot-cpal-table.hh index aade0e73..740a94b3 100644 --- a/src/hb-ot-cpal-table.hh +++ b/src/hb-ot-cpal-table.hh @@ -89,7 +89,6 @@ struct CPALV1Tail LOffsetTo<HBUINT32> paletteFlags; LOffsetTo<HBUINT16> paletteLabel; LOffsetTo<HBUINT16> paletteEntryLabel; - public: DEFINE_SIZE_STATIC (12); }; @@ -113,13 +112,12 @@ struct CPAL if (colorRecordIndices[i] + numPaletteEntries > colorRecords.get_size ()) return_trace (false); - if (version > 1) - { - const CPALV1Tail &v1 = StructAfter<CPALV1Tail> (*this); - return_trace (v1.sanitize (c, palettes)); - } - else + // If version is zero, we are done here; otherwise we need to check tail also + if (version == 0) return_trace (true); + + const CPALV1Tail &v1 = StructAfter<CPALV1Tail> (*this); + return_trace (v1.sanitize (c, palettes)); } inline unsigned int get_size (void) const @@ -158,7 +156,7 @@ struct CPAL HBUINT16 numPalettes; ArrayOf<ColorRecord> colorRecords; HBUINT16 colorRecordIndices[VAR]; // VAR=numPalettes - +/*CPALV1Tail v1[VAR];*/ public: DEFINE_SIZE_ARRAY (12, colorRecordIndices); }; |