commit 9a3797b3dc04f51ecd78fed2973a62e33e26a0cc
author Ray Smith <raymond.smith@arm.com> Fri Mar 15 15:33:04 2013 +0000
committer Ray Smith <raymond.smith@arm.com> Thu Mar 21 07:11:54 2013 +0000
tree d5010f8b49056585c388e9e6faaad839386be84d
parent 0655fb33e0cd7d57136976d16e923cb0b0344a4f

Clean up failures in DRI2CreateBuffer

Change-Id: If47c76bccac5ec9de9ca41886230de6f3e9549d7

src/omap_dri2.c

diff --git a/src/omap_dri2.c b/src/omap_dri2.c
index 237efac..ebcaebe 100644
--- a/src/omap_dri2.c
+++ b/src/omap_dri2.c
@@ -144,7 +144,7 @@
 	ScreenPtr pScreen = pDraw->pScreen;
 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
 	OMAPDRI2BufferPtr buf = calloc(1, sizeof(*buf));
-	PixmapPtr pPixmap;
+	PixmapPtr pPixmap = NULL;
 	struct omap_bo *bo;
 	int ret;
 
@@ -152,6 +152,7 @@
 			pDraw, attachment, format);
 
 	if (!buf) {
+		ERROR_MSG("Couldn't allocate internal buffer structure");
 		return NULL;
 	}
 
@@ -188,16 +189,14 @@
 	{
 		assert(attachment != DRI2BufferFrontLeft);
 		ERROR_MSG("Failed to create back buffer for window");
-		free(buf);
-		return NULL;
+		goto fail;
 	}
 
 	bo = OMAPPixmapBo(pPixmap);
 	if (!bo)
 	{
 		ERROR_MSG("Attempting to DRI2 wrap a pixmap with no DRM buffer object backing");
-		free(buf);
-		return NULL;
+		goto fail;
 	}
 
 	DRIBUF(buf)->attachment = attachment;
@@ -212,8 +211,7 @@
 	ret = omap_bo_get_name(bo, &DRIBUF(buf)->name);
 	if (ret) {
 		ERROR_MSG("could not get buffer name: %d", ret);
-		/* TODO: MIDEGL-1462: cleanup */
-		return NULL;
+		goto fail;
 	}
 
 	/* Q: how to know across OMAP generations what formats that the display
@@ -234,6 +232,22 @@
 	OMAPRegisterExternalAccess(pPixmap);
 
 	return DRIBUF(buf);
+
+fail:
+	if (pPixmap != NULL)
+	{
+		if (attachment != DRI2BufferFrontLeft)
+		{
+			pScreen->DestroyPixmap(pPixmap);
+		}
+		else
+		{
+			pPixmap->refcnt--;
+		}
+	}
+	free(buf);
+
+	return NULL;
 }
 
 /**