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

[morx/kerx] Fix sanitize regression 

Broke in 8dcc1913a1

If sanitizer is left with another object, it wouldn't work.

Better fix coming soon.
This commit is contained in:
Behdad Esfahbod 2018-11-24 14:52:34 -05:00
parent 3cc14e78ae
commit 20edc70d53
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,11 +962,9 @@ 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))) if (unlikely (!st->u.header.sanitize (c)))
{
c->reset_object ();
return_trace (false); return_trace (false);
}
/* OpenType kern table has 2-byte subtable lengths. That's limiting. /* OpenType kern table has 2-byte subtable lengths. That's limiting.
* MS implementation also only supports one subtable, of format 0, * MS implementation also only supports one subtable, of format 0,
* anyway. Certain versions of some fonts, like Calibry, contain * anyway. Certain versions of some fonts, like Calibry, contain
@ -976,8 +974,6 @@ struct KerxTable
* the length for the last subtable. */ * the length for the last subtable. */
if (i < count - 1) if (i < count - 1)
c->set_object (*st); c->set_object (*st);
else
c->reset_object ();
if (unlikely (!st->sanitize (c))) if (unlikely (!st->sanitize (c)))
return_trace (false); return_trace (false);

4
src/hb-aat-layout-morx-table.hh
View File

@ -1061,11 +1061,9 @@ struct Chain
unsigned int count = subtableCount; unsigned int count = subtableCount;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
c->reset_object ();
if (unlikely (!c->check_struct (subtable))) if (unlikely (!c->check_struct (subtable)))
{
c->reset_object ();
return_trace (false); return_trace (false);
}
c->set_object (*subtable); c->set_object (*subtable);
if (!subtable->sanitize (c)) if (!subtable->sanitize (c))
return_trace (false); return_trace (false);