xserver: Branch 'master'

[Eamon Walsh]

 Xext/xace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cd0603c2dc5ee000ebce66056bc1a72f99bfb617
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date:   Thu Jan 3 21:41:02 2008 -0500

    Bug #13765: Heap corruption in XC-SECURITY extension code.

diff --git a/Xext/xace.c b/Xext/xace.c
index 9f8a8cc..6a7df31 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -448,7 +448,7 @@ XaceCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h,
 
 	/* convert region to list-of-rectangles for PolyFillRect */
 
-	pRects = (xRectangle *)xalloc(nRects * sizeof(xRectangle *));
+	pRects = (xRectangle *)xalloc(nRects * sizeof(xRectangle));
 	if (!pRects)
 	{
 	    failed = TRUE;