From 4d91b1d5e422c5c460b1b7050baa9487a59b8aa8 Mon Sep 17 00:00:00 2001
From: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Thu, 28 Feb 2008 21:52:32 -0500
Subject: [PATCH] XACE: Adjust the location of the COMPOSITE creation hook.
 Avoids incrementing the refcnt if the hook fails.

---
 composite/compext.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composite/compext.c b/composite/compext.c
index 97ea6d616..b3433f72b 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -289,14 +289,14 @@ ProcCompositeNameWindowPixmap (ClientPtr client)
     if (!pPixmap)
 	return BadMatch;
 
-    ++pPixmap->refcnt;
-    
     /* security creation/labeling check */
     rc = XaceHook(XACE_RESOURCE_ACCESS, client, stuff->pixmap, RT_PIXMAP,
 		  pPixmap, RT_WINDOW, pWin, DixCreateAccess);
     if (rc != Success)
 	return rc;
 
+    ++pPixmap->refcnt;
+
     if (!AddResource (stuff->pixmap, RT_PIXMAP, (pointer) pPixmap))
 	return BadAlloc;