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

[glyf] Optimize points decoding byte range checking

This commit is contained in:
Behdad Esfahbod 2022-06-26 17:22:45 -06:00
parent 51cfcf2957
commit 0f1fdf461c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,13 +125,16 @@ struct SimpleGlyph
const simple_glyph_flag_t same_flag) const simple_glyph_flag_t same_flag)
{ {
float v = 0; float v = 0;
const HBUINT8 *end = (const HBUINT8 *) (bytes.arrayZ + bytes.length);
unsigned count = points_.length; unsigned count = points_.length;
for (unsigned i = 0; i < count; i++) for (unsigned i = 0; i < count; i++)
{ {
uint8_t flag = points_[i].flag; uint8_t flag = points_[i].flag;
if (flag & short_flag) if (flag & short_flag)
{ {
if (unlikely (!bytes.check_range (p))) return false; if (unlikely (p + 1 > end)) return false;
if (flag & same_flag) if (flag & same_flag)
v += *p++; v += *p++;
else else
@ -141,7 +144,7 @@ struct SimpleGlyph
{ {
if (!(flag & same_flag)) if (!(flag & same_flag))
{ {
if (unlikely (!bytes.check_range ((const HBUINT16 *) p))) return false; if (unlikely (p + HBINT16::static_size > end)) return false;
v += *(const HBINT16 *) p; v += *(const HBINT16 *) p;
p += HBINT16::static_size; p += HBINT16::static_size;
} }