xf86-video-intel: Branch '2.9' - uxa/uxa-render.c

[Carl Worth]

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

New commits:
commit 7ccf084b7a281d8aa877f91401d3df7192da408c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Oct 12 14:33:08 2009 +0100

    uxa: Free the ScratchPixmapHeader after its associated Picture
    
    Fixes: http://bugs.freedesktop.org/show_bug.cgi?id=24459
    Intel Driver > 2.8: Cairo rendering bug, triggered in QtCurve GTK engine
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
    (cherry picked from commit 7e8f32d0a7279dce1976f87612833d9092554cfe)

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 4850185..bf1460f 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -360,8 +360,8 @@ uxa_picture_from_a1_pixman_image (ScreenPtr pScreen,
     pSrc = CreatePicture (0, &pPixmap->drawable,
 			  PictureMatchFormat (pScreen, 1, PICT_a1),
 			  0, 0, serverClient, &error);
-    FreeScratchPixmapHeader (pPixmap);
     if (!pSrc) {
+	FreeScratchPixmapHeader (pPixmap);
 	FreePicture (pPicture, 0);
 	return 0;
     }
@@ -373,6 +373,7 @@ uxa_picture_from_a1_pixman_image (ScreenPtr pScreen,
 		      width, height);
 
     FreePicture (pSrc, 0);
+    FreeScratchPixmapHeader (pPixmap);
 
     return pPicture;
 }