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

[morx] Port to hb_sanitize_with_object_t

This commit is contained in:
Behdad Esfahbod 2018-11-24 23:46:15 -05:00
parent 1e8994221f
commit c405ed0509
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,6 +911,13 @@ struct ChainSubtable
} }
} }
inline bool apply (hb_aat_apply_context_t *c) const
{
TRACE_APPLY (this);
hb_sanitize_with_object_t with (&c->sanitizer, this);
return_trace (dispatch (c));
}
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
@ -919,6 +926,7 @@ struct ChainSubtable
!c->check_range (this, length)) !c->check_range (this, length))
return_trace (false); return_trace (false);
hb_sanitize_with_object_t with (c, this);
return_trace (dispatch (c)); return_trace (dispatch (c));
} }
@ -1026,9 +1034,7 @@ struct Chain
if (reverse) if (reverse)
c->buffer->reverse (); c->buffer->reverse ();
c->sanitizer.set_object (subtable); subtable->apply (c);
subtable->dispatch (c);
if (reverse) if (reverse)
c->buffer->reverse (); c->buffer->reverse ();
@ -1041,7 +1047,6 @@ struct Chain
subtable = &StructAfter<ChainSubtable<Types> > (*subtable); subtable = &StructAfter<ChainSubtable<Types> > (*subtable);
c->set_lookup_index (c->lookup_index + 1); c->set_lookup_index (c->lookup_index + 1);
} }
c->sanitizer.set_object ();
} }
inline unsigned int get_size (void) const { return length; } inline unsigned int get_size (void) const { return length; }
@ -1061,15 +1066,10 @@ 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->set_object ();
if (unlikely (!c->check_struct (subtable)))
return_trace (false);
c->set_object (subtable);
if (!subtable->sanitize (c)) if (!subtable->sanitize (c))
return_trace (false); return_trace (false);
subtable = &StructAfter<ChainSubtable<Types> > (*subtable); subtable = &StructAfter<ChainSubtable<Types> > (*subtable);
} }
c->set_object ();
return_trace (true); return_trace (true);
} }