Mesa (master): glsl2: Clear out profile pointers in _mesa_glsl_release_functions

Ian Romanick idr at kemper.freedesktop.org
Thu Sep 9 00:22:46 UTC 2010


Module: Mesa
Branch: master
Commit: f69a6647fbd5e7cf4406fcc877ff78b507344073
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f69a6647fbd5e7cf4406fcc877ff78b507344073

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Sep  8 17:13:00 2010 -0700

glsl2: Clear out profile pointers in _mesa_glsl_release_functions

Otherwise builtin_profiles contains dangling pointers the next time
_mesa_read_profile is called.  I suspect this may fix bugzilla #29847,
but I was never able to reproduce it.

---

 src/glsl/builtin_function.cpp                |    1 +
 src/glsl/builtins/tools/generate_builtins.py |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index 0a2b012..944265c 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -19143,6 +19143,7 @@ _mesa_glsl_release_functions(void)
 {
    talloc_free(builtin_mem_ctx);
    builtin_mem_ctx = NULL;
+   memset(builtin_profiles, 0, sizeof(builtin_profiles));
 }
 
 static void
diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
index 2431096..f96a5f7 100755
--- a/src/glsl/builtins/tools/generate_builtins.py
+++ b/src/glsl/builtins/tools/generate_builtins.py
@@ -182,6 +182,7 @@ _mesa_glsl_release_functions(void)
 {
    talloc_free(builtin_mem_ctx);
    builtin_mem_ctx = NULL;
+   memset(builtin_profiles, 0, sizeof(builtin_profiles));
 }
 
 static void




More information about the mesa-commit mailing list