summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-08-18 17:42:34 -0700
committerEric Anholt <eric@anholt.net>2010-08-18 17:45:08 -0700
commitf5703a54e2f765237e01eef6ddbd019ca6a58e81 (patch)
tree0aac22bf60f80280bdda7d502623b44b49e61915
parentf1d5a9419784e939da1a4bcc482567f315da541a (diff)
mesa: Don't try to free components of a NULL uniform list.
This might happen if we manage to trigger the right linker errors.
-rw-r--r--src/mesa/program/prog_uniform.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/program/prog_uniform.c b/src/mesa/program/prog_uniform.c
index 5aa9878d43..28acb8871a 100644
--- a/src/mesa/program/prog_uniform.c
+++ b/src/mesa/program/prog_uniform.c
@@ -44,6 +44,10 @@ void
_mesa_free_uniform_list(struct gl_uniform_list *list)
{
GLuint i;
+
+ if (!list)
+ return;
+
for (i = 0; i < list->NumUniforms; i++) {
free((void *) list->Uniforms[i].Name);
}