From 7e8f32d0a7279dce1976f87612833d9092554cfe Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 12 Oct 2009 14:33:08 +0100
Subject: 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@chris-wilson.co.uk>
---
 uxa/uxa-render.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/uxa/uxa-render.c b/uxa/uxa-render.c
index 32ea3798..8f0bd1f8 100644
--- a/uxa/uxa-render.c
+++ b/uxa/uxa-render.c
@@ -346,8 +346,8 @@ uxa_picture_from_a1_pixman_image(ScreenPtr pScreen, pixman_image_t * image)
 	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;
 	}
@@ -356,6 +356,7 @@ uxa_picture_from_a1_pixman_image(ScreenPtr pScreen, pixman_image_t * image)
 			 0, 0, 0, 0, 0, 0, width, height);
 
 	FreePicture(pSrc, 0);
+	FreeScratchPixmapHeader(pPixmap);
 
 	return pPicture;
 }
-- 
cgit v1.2.3