[aat] Minor

This commit is contained in:
Behdad Esfahbod 2018-02-08 15:11:28 -06:00
parent 1242ad8424
commit 5021ba2a21
2 changed files with 8 additions and 9 deletions

View File

@ -563,9 +563,9 @@ struct StateTable
unsigned int entry = 0;
while (state < num_states)
{
if (unlikely (!c->check_array (states + state * nClasses,
states[0].static_size,
nClasses * (num_states - state))))
if (unlikely (!c->check_array (states,
states[0].static_size * nClasses,
num_states)))
return_trace (false);
{ /* Sweep new states. */
const HBUINT16 *stop = &states[num_states * nClasses];
@ -574,9 +574,9 @@ struct StateTable
state = num_states;
}
if (unlikely (!c->check_array (entries + entry,
if (unlikely (!c->check_array (entries,
entries[0].static_size,
num_entries - entry)))
num_entries)))
return_trace (false);
{ /* Sweep new entries. */
const Entry<Extra> *stop = &entries[num_entries];

View File

@ -281,7 +281,7 @@ struct ContextualSubtable
TRACE_SANITIZE (this);
unsigned int num_entries = 0;
if (unlikely (!machine.sanitize (c, &num_entries))) return false;
if (unlikely (!machine.sanitize (c, &num_entries))) return_trace (false);
unsigned int num_lookups = 0;
@ -454,9 +454,8 @@ struct LigatureSubtable
{
TRACE_SANITIZE (this);
/* The rest of array sanitizations are done at run-time. */
return c->check_struct (this) && machine.sanitize (c) &&
ligAction && component && ligature;
return_trace (true);
return_trace (c->check_struct (this) && machine.sanitize (c) &&
ligAction && component && ligature);
}
protected: