Attachment 25786 Details for Bug 21688 – avoid segfault in radeon_update_renderbuffers() if using DRI1

[patch] avoid segfault in radeon_update_renderbuffers() if using DRI1

0001-radeon-fix-DRI1-case.patch (text/plain), 1.77 KB, created by Tormod Volden on 2009-05-12 00:37:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tormod Volden

Created: 2009-05-12 00:37:55 UTC

Size: 1.77 KB

patch

obsolete

>From 07ea9f705cf0a6ab779e451b2ffc5d12d09644ca Mon Sep 17 00:00:00 2001
>From: Tormod Volden <debian.tormod@gmail.com>
>Date: Tue, 12 May 2009 09:32:11 +0200
>Subject: [PATCH] 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>
>---
> .../drivers/dri/radeon/radeon_common_context.c     |    7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/radeon/radeon_common_context.c b/src/mesa/drivers/dri/radeon/radeon_common_context.c
>index 124b587..6fb6f92 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;
>-- 
>1.6.0.4
>

Actions: View | Splinter Review

Attachments on bug 21688: 25746 | 25747 | 25786

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.