[aat] Fix ContextualSubtable sanitization

Fixes MORX-18, MORX-19, and MORX-22.
This commit is contained in:
Behdad Esfahbod 2018-02-02 15:53:25 -05:00
parent cf943f682b
commit fe5f9b1ae3
1 changed files with 4 additions and 2 deletions

View File

@ -275,8 +275,10 @@ struct ContextualSubtable
{ {
const EntryData &data = entries[i].data; const EntryData &data = entries[i].data;
num_lookups = MAX<unsigned int> (num_lookups, 1 + data.markIndex); if (data.markIndex != 0xFFFF)
num_lookups = MAX<unsigned int> (num_lookups, 1 + data.currentIndex); num_lookups = MAX<unsigned int> (num_lookups, 1 + data.markIndex);
if (data.currentIndex != 0xFFFF)
num_lookups = MAX<unsigned int> (num_lookups, 1 + data.currentIndex);
} }
return_trace (substitutionTables.sanitize (c, this, num_lookups)); return_trace (substitutionTables.sanitize (c, this, num_lookups));