[Mesa-dev] [PATCH 4/4] i915: Don't free the intel_context structure when intelCreateContext fails.

Ian Romanick idr at freedesktop.org
Fri Sep 28 08:55:58 PDT 2012


From: Ian Romanick <ian.d.romanick at intel.com>

intelDestroyContext will eventually be called, and it will clean things up.

NOTE: This is a candidate for the 9.0 branch.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=53618
---
 src/mesa/drivers/dri/i915/i915_context.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index 8ae1e58..c0d1f93 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -167,7 +167,6 @@ i915CreateContext(int api,
 
    if (!intelInitContext(intel, api, mesaVis, driContextPriv,
                          sharedContextPrivate, &functions)) {
-      free(i915);
       *error = __DRI_CTX_ERROR_NO_MEMORY;
       return false;
    }
@@ -184,7 +183,6 @@ i915CreateContext(int api,
 
       if (req_version > max_version) {
          *error = __DRI_CTX_ERROR_BAD_VERSION;
-         free(i915);
          return false;
       }
       break;
@@ -194,7 +192,6 @@ i915CreateContext(int api,
       break;
    default:
       *error = __DRI_CTX_ERROR_BAD_API;
-      free(i915);
       return false;
    }
 
-- 
1.7.11.4



More information about the mesa-dev mailing list