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

usp10: Validate positioning record sequence indices in GPOS_apply_ContextPos(). 

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:27:00 +02:00 committed by Alexandre Julliard
parent 82d36ba63f
commit c5619beb77
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/usp10/opentype.c
View File

@ -2195,12 +2195,21 @@ static unsigned int GPOS_apply_ContextPos(const ScriptCache *script_cache, const
for (l = 0; l < GET_BE_WORD(pr->PosCount); l++) for (l = 0; l < GET_BE_WORD(pr->PosCount); l++)
{ {
int lookupIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex); unsigned int lookup_index = GET_BE_WORD(pr_2->PosLookupRecord[l].LookupListIndex);
int SequenceIndex = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex) * write_dir; unsigned int sequence_index = GET_BE_WORD(pr_2->PosLookupRecord[l].SequenceIndex);
TRACE("Position: %i -> %i %i\n",l, SequenceIndex, lookupIndex); g = glyph_index + write_dir * sequence_index;
GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance, lookup, lookupIndex, if (g >= glyph_count)
glyphs, glyph_index + SequenceIndex, glyph_count, goffset); {
WARN("Invalid sequence index %u (glyph index %u, write dir %d).\n",
sequence_index, glyph_index, write_dir);
continue;
}
TRACE("Position: %u -> %u %u.\n", l, sequence_index, lookup_index);
GPOS_apply_lookup(script_cache, otm, logfont, analysis, advance,
lookup, lookup_index, glyphs, g, glyph_count, goffset);
} }
return 1; return 1;
} }