From 0e62d92d5b809bc3a6503e9bc386cf961fc22557 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Fri, 14 Apr 2006 23:43:32 +0000
Subject: [PATCH] Coverity #804: Another leak on OOM path.

---
 ChangeLog          | 5 +++++
 hw/dmx/dmxpixmap.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index be45844fc..354d580d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-14  Adam Jackson  <ajax@freedesktop.org>
+
+	* hw/dmx/dmxpixmap.c:
+	Coverity #804: Another leak on OOM path.
+
 2006-04-14  Adam Jackson  <ajax@freedesktop.org>
 
 	* mi/micmap.c:
diff --git a/hw/dmx/dmxpixmap.c b/hw/dmx/dmxpixmap.c
index e95ddd72e..4a669fdd9 100644
--- a/hw/dmx/dmxpixmap.c
+++ b/hw/dmx/dmxpixmap.c
@@ -213,7 +213,10 @@ RegionPtr dmxBitmapToRegion(PixmapPtr pPixmap)
 
     pReg = REGION_CREATE(pScreen, NullBox, 1);
     pTmpReg = REGION_CREATE(pScreen, NullBox, 1);
-    if(!pReg || !pTmpReg) return NullRegion;
+    if(!pReg || !pTmpReg) {
+	XDestroyImage(ximage);
+	return NullRegion;
+    }
 
     for (y = 0; y < pPixmap->drawable.height; y++) {
 	Box.y1 = y;