From: Tormod Volden <debian.tormod@gmail.com>
Date: Tue, 12 May 2009 07:32:11 +0000 (+0200)
Subject: radeon: avoid segfault in radeon_update_renderbuffers() if using DRI1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0bfa8dfaaf49703eb5c3237b5cae6201b8755e4d;p=mesa.git

radeon: avoid segfault in radeon_update_renderbuffers() if using DRI1

Basically the same as 43d9020ff1e975e7f4f9480d9ef24f0b9fb2141f for intel. Bug 21688.

Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
index 124b587bab1..6fb6f92cb94 100644
--- a/src/mesa/drivers/dri/radeon/radeon_common_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_common_context.c
@@ -428,7 +428,7 @@ void
 radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
 {
 	unsigned int attachments[10];
-	__DRIbuffer *buffers;
+	__DRIbuffer *buffers = NULL;
 	__DRIscreen *screen;
 	struct radeon_renderbuffer *rb;
 	int i, count;
@@ -444,7 +444,8 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
 	screen = context->driScreenPriv;
 	radeon = (radeonContextPtr) context->driverPrivate;
 
-	if ((screen->dri2.loader->base.version > 2)
+	if (screen->dri2.loader
+	   && (screen->dri2.loader->base.version > 2)
 	   && (screen->dri2.loader->getBuffersWithFormat != NULL)) {
 		struct radeon_renderbuffer *depth_rb;
 		struct radeon_renderbuffer *stencil_rb;
@@ -481,7 +482,7 @@ radeon_update_renderbuffers(__DRIcontext *context, __DRIdrawable *drawable)
 								attachments, i / 2,
 								&count,
 								drawable->loaderPrivate);
-	} else {
+	} else if (screen->dri2.loader) {
 		i = 0;
 		if (draw->color_rb[0])
 			attachments[i++] = __DRI_BUFFER_FRONT_LEFT;