xserver: Branch 'master'

[Aaron Plattner]

 composite/compext.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree 3690de9b1b0902d395bc7d071fc05ebc8f75be2b (from f9f7d7f3be53c808abb5eaceb7a1abc55744a210)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Dec 5 12:42:12 2006 -0800

    Bug #9219: Return BadMatch when trying to name the backing pixmap of an unrealized window.
    
    Before this change, ProcCompositeNameWindowPixmap would name the screen pixmap
    if !pWin->realized.

diff --git a/composite/compext.c b/composite/compext.c
index a7ad4e2..ec5e1fa 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -269,7 +269,10 @@ ProcCompositeNameWindowPixmap (ClientPtr
 	client->errorValue = stuff->window;
 	return BadWindow;
     }
-    
+
+    if (!pWin->realized)
+	return BadMatch;
+
     LEGAL_NEW_RESOURCE (stuff->pixmap, client);
     
     cw = GetCompWindow (pWin);