Attachment 66700 Details for Bug 54301 – Proposed fix, v2

[patch] Proposed fix, v2

0001-i965-Don-t-leave-dangling-pointer-to-brw-context-on-.patch (text/plain), 1.67 KB, created by Ian Romanick on 2012-09-05 22:15:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2012-09-05 22:15:54 UTC

Size: 1.67 KB

patch

obsolete

>From 633fd46658dec5625d75f325d574e66fcec8448d Mon Sep 17 00:00:00 2001
>From: Ian Romanick <ian.d.romanick@intel.com>
>Date: Fri, 31 Aug 2012 14:55:21 -0700
>Subject: [PATCH] i965: Don't leave dangling pointer to brw context on failure
>
>Otherwise intelDestroyContext would try to dereference the pointer to
>freed memory.
>
>v2: Don't call intelDestroyContext if the context already freed due to
>failure.
>
>NOTE: This is a candidate for the 9.0 branch.
>
>Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54301
>---
> src/mesa/drivers/dri/i965/brw_context.c   | 1 +
> src/mesa/drivers/dri/intel/intel_screen.c | 4 +++-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
>index 1083e28..60b6454 100644
>--- a/src/mesa/drivers/dri/i965/brw_context.c
>+++ b/src/mesa/drivers/dri/i965/brw_context.c
>@@ -149,6 +149,7 @@ brwCreateContext(int api,
> 			  sharedContextPrivate, &functions )) {
>       printf("%s: failed to init intel context\n", __FUNCTION__);
>       free(brw);
>+      driContextPriv->driverPrivate = NULL;
>       *error = __DRI_CTX_ERROR_NO_MEMORY;
>       return false;
>    }
>diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
>index 3470db6..980ffed 100644
>--- a/src/mesa/drivers/dri/intel/intel_screen.c
>+++ b/src/mesa/drivers/dri/intel/intel_screen.c
>@@ -820,7 +820,9 @@ intelCreateContext(gl_api api,
>    if (success)
>       return true;
> 
>-   intelDestroyContext(driContextPriv);
>+   if (driContextPriv->driverPrivate != NULL)
>+      intelDestroyContext(driContextPriv);
>+
>    return false;
> }
> 
>-- 
>1.7.11.4
>

Actions: View | Splinter Review

Attachments on bug 54301: 66421 | 66700 | 67741

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.