usp10: Use memmove() in GSUB_apply_LigatureSubst().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

usp10: Use memmove() in GSUB_apply_LigatureSubst().
bab506e1 · Henri Verbeet · Alexandre Julliard · 66df220c · bab506e1
Commit bab506e1 authored Mar 01, 2017 by Henri Verbeet Committed by Alexandre Julliard Mar 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

opentype.c dlls/usp10/opentype.c +2 -3

No files found.
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -1058,9 +1058,8 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN
                    TRACE("0x%x\n",glyphs[replaceIdx]);
                    if (CompCount > 0)
                    {
-                        int j;
+                        unsigned int j = replaceIdx + 1;
-                        for (j = replaceIdx + 1; j < *glyph_count; j++)
+                        memmove(&glyphs[j], &glyphs[j + CompCount], (*glyph_count - j) * sizeof(*glyphs));
-                            glyphs[j] =glyphs[j+CompCount];
                        *glyph_count = *glyph_count - CompCount;
                    }
                    return replaceIdx + write_dir;