From 1d9874a09eb99d723203ddeec334722c17fd938c Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Tue, 12 Jun 2007 16:51:31 +0200
Subject: [PATCH] winex11.drv: Glyph width is rounded to 32 bits, make sure to
 provide enough null data.

---
 dlls/winex11.drv/xrender.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c
index 74a7e2b2072..1e196a737a8 100644
--- a/dlls/winex11.drv/xrender.c
+++ b/dlls/winex11.drv/xrender.c
@@ -633,7 +633,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
     gsCacheEntryFormat *formatEntry;
     UINT ggo_format = GGO_GLYPH_INDEX;
     XRenderPictFormat pf;
-    const char zero = 0;
+    static const char zero[4];
 
     switch(format) {
     case AA_Grey:
@@ -822,7 +822,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
 
         wine_tsx11_lock();
 	pXRenderAddGlyphs(gdi_display, formatEntry->glyphset, &gid, &gi, 1,
-			  buflen ? buf : &zero, buflen ? buflen : 1);
+                          buflen ? buf : zero, buflen ? buflen : sizeof(zero));
 	wine_tsx11_unlock();
 	HeapFree(GetProcessHeap(), 0, buf);
     } else {
-- 
2.11.4.GIT