walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[glyf] Optimize flags decoding byte range checking

This commit is contained in:
Behdad Esfahbod 2022-06-26 17:24:29 -06:00
parent 0f1fdf461c
commit a21a9bb855
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/OT/glyf/SimpleGlyph.hh
View File

@ -173,15 +173,17 @@ struct SimpleGlyph
const HBUINT8 *p = &StructAtOffset<HBUINT8> (&endPtsOfContours[num_contours + 1], const HBUINT8 *p = &StructAtOffset<HBUINT8> (&endPtsOfContours[num_contours + 1],
endPtsOfContours[num_contours]); endPtsOfContours[num_contours]);
const HBUINT8 *end = (const HBUINT8 *) (bytes.arrayZ + bytes.length);
/* Read flags */ /* Read flags */
for (unsigned int i = 0; i < num_points;) for (unsigned int i = 0; i < num_points;)
{ {
if (unlikely (!bytes.check_range (p))) return false; if (unlikely (p + 1 > end)) return false;
uint8_t flag = *p++; uint8_t flag = *p++;
points_[i++].flag = flag; points_[i++].flag = flag;
if (flag & FLAG_REPEAT) if (flag & FLAG_REPEAT)
{ {
if (unlikely (!bytes.check_range (p))) return false; if (unlikely (p + 1 > end)) return false;
unsigned int repeat_count = *p++; unsigned int repeat_count = *p++;
unsigned stop = hb_min (i + repeat_count, num_points); unsigned stop = hb_min (i + repeat_count, num_points);
for (; i < stop;) for (; i < stop;)