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

Revert "[aat.kerx] Remove kerx subtable boundary enforcement" 

This reverts commit 15905a2a29.
This commit is contained in:
Behdad Esfahbod 2018-11-24 22:16:53 -05:00
parent 9eeebd8dde
commit c8a2dc820e
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/hb-aat-layout-kerx-table.hh
View File

@ -926,6 +926,12 @@ struct KerxTable
if (reverse) if (reverse)
c->buffer->reverse (); c->buffer->reverse ();
/* See comment in sanitize() for conditional here. */
if (i < count - 1)
c->sanitizer.set_object (*st);
else
c->sanitizer.reset_object ();
ret |= st->dispatch (c); ret |= st->dispatch (c);
if (reverse) if (reverse)
@ -937,6 +943,7 @@ struct KerxTable
st = &StructAfter<SubTable> (*st); st = &StructAfter<SubTable> (*st);
c->set_lookup_index (c->lookup_index + 1); c->set_lookup_index (c->lookup_index + 1);
} }
c->sanitizer.reset_object ();
return ret; return ret;
} }
@ -955,10 +962,24 @@ struct KerxTable
unsigned int count = thiz()->tableCount; unsigned int count = thiz()->tableCount;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
c->reset_object ();
if (unlikely (!st->u.header.sanitize (c)))
return_trace (false);
/* OpenType kern table has 2-byte subtable lengths. That's limiting.
* MS implementation also only supports one subtable, of format 0,
* anyway. Certain versions of some fonts, like Calibry, contain
* kern subtable that exceeds 64kb. Looks like, the subtable length
* is simply ignored. Which makes sense. It's only needed if you
* have multiple subtables. To handle such fonts, we just ignore
* the length for the last subtable. */
if (i < count - 1)
c->set_object (*st);
if (unlikely (!st->sanitize (c))) if (unlikely (!st->sanitize (c)))
return_trace (false); return_trace (false);
st = &StructAfter<SubTable> (*st); st = &StructAfter<SubTable> (*st);
} }
c->reset_object ();
return_trace (true); return_trace (true);
} }