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

[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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-aat-layout-common-private.hh
View File

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

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

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