gdi32: Don't overrun the current scanline while copying a glyph's bitmap.

a643337c · Huw Davies · Alexandre Julliard · 7c8b8e0a · a643337c
Commit a643337c authored Apr 08, 2008 by Huw Davies Committed by Alexandre Julliard Apr 08, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

freetype.c dlls/gdi32/freetype.c +6 -1

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4384,7 +4384,12 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
            INT x;
            while(h--) {
                for(x = 0; x < pitch; x++)
-                    dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0;
+                {
+                    if(x < ft_face->glyph->bitmap.width)
+                        dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0;
+                    else
+                        dst[x] = 0;
+                }
                src += ft_face->glyph->bitmap.pitch;
                dst += pitch;
            }