xserver: Branch 'master'

[Jerome Glisse]

 glx/glxdri2.c |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 084ae9e38812f19751a086eea7ce555761ae5a17
Author: Jerome Glisse <glisse at freedesktop.org>
Date:   Thu Oct 23 11:28:53 2008 +0200

    dri2: fail at context creation if driver fail to create it's context

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 207ad06..c4105e2 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -303,6 +303,10 @@ __glXDRIscreenCreateContext(__GLXscreen *baseScreen,
 	(*screen->dri2->createNewContext)(screen->driScreen,
 					  config->driConfig,
 					  driShare, context);
+    if (context->driContext == NULL) {
+	    xfree(context);
+        return NULL;
+    }
 
     return &context->base;
 }