xserver: Branch 'master'

[Alan Hourihane]

 GL/glx/glxdri.c |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 43e46a654fa7cf69f0c8bcb7f583008d96a98686
Author: Alan Hourihane <alanh at tungstengraphics.com>
Date:   Wed Feb 27 16:58:21 2008 +0000

    Fix context sharing between direct/indirect contexts

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index f51a531..613ac05 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -614,6 +614,9 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
     else
 	driShare = NULL;
 
+    if (baseShareContext && baseShareContext->isDirect)
+        return NULL;
+
     context = xalloc(sizeof *context);
     if (context == NULL)
 	return NULL;
@@ -649,6 +652,11 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
 					   hwContext,
 					   &context->driContext);
 
+    if (context->driContext.private == NULL) {
+	xfree(context);
+	return NULL;
+    }
+
     return &context->base;
 }