Alexandre Julliard : gdi32: Avoid reading bits outside of the glyph bitmap in GetGlyphOutline.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 05b1aea24439a1c01a72026ba8f996d0d018b5e4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=05b1aea24439a1c01a72026ba8...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Fri Apr  8 12:38:32 2011 +0200

gdi32: Avoid reading bits outside of the glyph bitmap in GetGlyphOutline.

---

 dlls/gdi32/freetype.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index aefb0e8..03a4cbd 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -4939,14 +4939,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
             BYTE *src = ft_face->glyph->bitmap.buffer, *dst = buf;
             INT h = ft_face->glyph->bitmap.rows;
             INT x;
+            memset( buf, 0, needed );
             while(h--) {
-                for(x = 0; x < pitch; x++)
-                {
-                    if(x < ft_face->glyph->bitmap.width)
-                        dst[x] = (src[x / 8] & (1 << ( (7 - (x % 8))))) ? 0xff : 0;
-                    else
-                        dst[x] = 0;
-                }
+                for(x = 0; x < pitch && x < ft_face->glyph->bitmap.width; x++)
+                    if (src[x / 8] & (1 << ( (7 - (x % 8))))) dst[x] = 0xff;
                 src += ft_face->glyph->bitmap.pitch;
                 dst += pitch;
             }
@@ -5025,9 +5021,10 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
             src = ft_face->glyph->bitmap.buffer;
             src_pitch = ft_face->glyph->bitmap.pitch;
 
+            height = min( height, ft_face->glyph->bitmap.rows );
             while ( height-- )
             {
-                for (x = 0; x < width; x++)
+                for (x = 0; x < width && x < ft_face->glyph->bitmap.width; x++)
                 {
                     if ( src[x / 8] & (1 << ( (7 - (x % 8)))) )
                         ((unsigned int *)dst)[x] = ~0u;