Mesa (10.1): main: Avoid double-free of shader Label

[Ian Romanick]

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

Author: Carl Worth <cworth at cworth.org>
Date:   Thu Feb 13 09:49:27 2014 -0800

main: Avoid double-free of shader Label

As documented, the _mesa_free_shader_program_data function:

	"Frees all the data that hangs off a shader program object, but not
	the object itself."

This means that this function may be called multiple times on the same object,
(and has been observed to). Meanwhile, the shProg->Label field was not being
set to NULL after its free(). This led to a second call to free() of the same
address on the second call to this function.

Fix this by setting this field to NULL after free(), (just as with all other
calls to free() in this function).

Reviewed-by: Brian Paul <brianp at vmware.com>

CC: mesa-stable at lists.freedesktop.org
(cherry picked from commit a92581acf2aba5e5e9fa199b778e649d5741754d)

---

 src/mesa/main/shaderobj.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 4f4bb69..d5c3d80 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -355,6 +355,7 @@ _mesa_free_shader_program_data(struct gl_context *ctx,
    }
 
    free(shProg->Label);
+   shProg->Label = NULL;
 }