aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/uniform_query.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-26 14:37:05 +0200
committermarha <marha@users.sourceforge.net>2012-03-26 14:37:05 +0200
commitfb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (patch)
treed9b7345ddfe702b820c7020fb784f0e3dc2253bf /mesalib/src/mesa/main/uniform_query.cpp
parent76bcc36ed305418a3ddc5752d287ede894243e1b (diff)
parent1d6d472342aee7b9c68e9f1d92762ef808d35ac2 (diff)
downloadvcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.gz
vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.tar.bz2
vcxsrv-fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/uniform_query.cpp')
-rw-r--r--mesalib/src/mesa/main/uniform_query.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/uniform_query.cpp b/mesalib/src/mesa/main/uniform_query.cpp
index 991df7896..da41ee84c 100644
--- a/mesalib/src/mesa/main/uniform_query.cpp
+++ b/mesalib/src/mesa/main/uniform_query.cpp
@@ -905,8 +905,10 @@ _mesa_get_uniform_location(struct gl_context *ctx,
name_copy[i-1] = '\0';
offset = strtol(&name[i], NULL, 10);
- if (offset < 0)
+ if (offset < 0) {
+ free(name_copy);
return -1;
+ }
array_lookup = true;
} else {