xserver: Branch 'master'

[Adam Jackson]

 render/render.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60cfaa45a532bd3cfcfb4bd57b2f657c0a8b6a6b
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 6 18:47:06 2008 -0400

    Build fix.

diff --git a/render/render.c b/render/render.c
index 9e04a13..7cb93bd 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1571,13 +1571,13 @@ ProcRenderCreateCursor (ClientPtr client)
     
     stride = BitmapBytePad(width);
     nbytes_mono = stride*height;
-    srcbits = xcalloc(nbytes_mono);
+    srcbits = xcalloc(1, nbytes_mono);
     if (!srcbits)
     {
 	xfree (argbbits);
 	return (BadAlloc);
     }
-    mskbits = xcalloc(nbytes_mono);
+    mskbits = xcalloc(1, nbytes_mono);
     if (!mskbits)
     {
 	xfree(argbbits);