From: Jose Fonseca <jfonseca@vmware.com>
Date: Thu, 12 Mar 2015 09:57:43 +0000 (+0000)
Subject: gallivm: Prevent double delete on LLVM 3.6
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=70dc8a9930f561d7ce6db7e58b5bc9b4d940e37b;p=mesa.git

gallivm: Prevent double delete on LLVM 3.6

std::unique_ptr takes ownership of MM, and a double delete could ensure
in case of an error,  as pointed out by Chris Vine in
https://bugs.freedesktop.org/show_bug.cgi?id=89387

Reviewed-by: Chris Vine <chris@cvine.freeserve.co.uk>
---

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index e2578cfccb8..d60db91df95 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -502,6 +502,7 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
 
 #if HAVE_LLVM >= 0x0306
        builder.setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>(MM));
+       MM = NULL; // onwership taken by std::unique_ptr
 #else
        builder.setMCJITMemoryManager(MM);
 #endif