ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Validate substition record sequence indices in GSUB_apply_ChainContextSubst().

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2017-04-17 20:26:57 +02:00 committed by Alexandre Julliard
parent 34a9400a89
commit d1ca880ec4
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/usp10/opentype.c
View File

@ -1346,12 +1346,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo
substitute_count = GET_BE_WORD(substitute->SubstCount); substitute_count = GET_BE_WORD(substitute->SubstCount);
for (k = 0; k < substitute_count; ++k) for (k = 0; k < substitute_count; ++k)
{ {
WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); unsigned int lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex);
WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; unsigned int sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex);
unsigned int g = glyph_index + write_dir * sequence_index;
if (g >= *glyph_count)
{
WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n",
sequence_index, glyph_index, write_dir);
continue;
}
TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index);
new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count);
glyph_index + sequence_index, write_dir, glyph_count);
if (new_index == GSUB_E_NOGLYPH) if (new_index == GSUB_E_NOGLYPH)
ERR("Chain failed to generate a glyph.\n"); ERR("Chain failed to generate a glyph.\n");
} }
@ -1426,12 +1433,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo
substitution_count = GET_BE_WORD(substitute->SubstCount); substitution_count = GET_BE_WORD(substitute->SubstCount);
for (k = 0; k < substitution_count; ++k) for (k = 0; k < substitution_count; ++k)
{ {
WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); unsigned int lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex);
WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; unsigned int sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex);
unsigned int g = glyph_index + write_dir * sequence_index;
if (g >= *glyph_count)
{
WARN("Skipping invalid sequence index %u (glyph index %u, write dir %d).\n",
sequence_index, glyph_index, write_dir);
continue;
}
TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index);
new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, g, write_dir, glyph_count);
glyph_index + sequence_index, write_dir, glyph_count);
if (new_index == GSUB_E_NOGLYPH) if (new_index == GSUB_E_NOGLYPH)
ERR("Chain failed to generate a glyph.\n"); ERR("Chain failed to generate a glyph.\n");
} }