xf86-video-intel: uxa/uxa-render.c

[Carl Worth]

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

New commits:
commit 10946118dd3a63f1375a1bfde0b2f0542a93c1c2
Author: Albert Damen <albrt at gmx.net>
Date:   Sun Oct 25 18:02:07 2009 +0100

    Fix crash in uxa_acquire_pattern when pDst is NULL
    
    This avoids a crash when an XRenderComposite call is made with a
    -1 value for width/height, (which apparently compiz's gtk-window-
    decorator likes to do). Fixes bug:
    
    	X crashes in uxa_acquire_pattern when logging in (gdm)
    	http://bugs.freedesktop.org/show_bug.cgi?id=24724
    
    Signed-off-by: Albert Damen <albrt at gmx.net>
    Reviewed-by: Carl Worth <cworth at cworth.org>

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 497c93d..7c0dbe5 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -449,6 +449,8 @@ uxa_acquire_pattern(ScreenPtr pScreen,
 	PicturePtr pDst;
 
 	pDst = uxa_picture_for_pixman_format(pScreen, format, width, height);
+	if (!pDst)
+		return 0;
 	if (uxa_prepare_access(pDst->pDrawable, UXA_ACCESS_RW)) {
 		fbComposite(PictOpSrc, pSrc, NULL, pDst,
 			    x, y, 0, 0, 0, 0, width, height);