xserver: Branch 'master'

[Adam Jackson]

 composite/compalloc.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 100afae578e59e31b65a6264c281ba7deea5ac39
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 24 10:52:31 2008 -0400

    Bug #15586: (Correctly) refuse to redirect the root window.

diff --git a/composite/compalloc.c b/composite/compalloc.c
index 0372b9b..19c7db0 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -82,6 +82,9 @@ compRedirectWindow (ClientPtr pClient, WindowPtr pWin, int update)
 	return Success;
     }
 
+    if (!pWin->parent)
+	return BadMatch;
+
     /*
      * Only one Manual update is allowed
      */