xserver: Branch 'master'

[Peter Hutterer]

 dix/dixfonts.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4970666827e65424ee17ccf6341ff84aac974383
Author: Kim Woelders <kim at woelders.dk>
Date:   Tue Sep 29 20:31:45 2009 +0200

    dix: Fix potential memory corruption in doListFontsWithInfo.
    
    Signed-off-by: Kim Woelders <kim at woelders.dk>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index d0a46c7..329318d 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1046,7 +1046,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c)
 		    err = AllocError;
 		    break;
 		}
-		memset(reply + c->length, 0, length - c->length);
+		memset((char*)reply + c->length, 0, length - c->length);
 		c->reply = reply;
 		c->length = length;
 	    }