Mesa (master): glsl: check for leading zeros in array index validation
Timothy Arceri
tarceri at kemper.freedesktop.org
Wed Jul 22 02:58:50 UTC 2015
Module: Mesa
Branch: master
Commit: 09c440c718992d48ef118c1aad6929ad215ccd3b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=09c440c718992d48ef118c1aad6929ad215ccd3b
Author: Timothy Arceri <t_arceri at yahoo.com.au>
Date: Fri Jul 3 08:45:30 2015 +1000
glsl: check for leading zeros in array index validation
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>
---
src/glsl/linker.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 28ad2f3..58dd9fb 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -462,6 +462,10 @@ parse_program_resource_name(const GLchar *name,
if (array_index < 0)
return -1;
+ /* Check for leading zero */
+ if (name[i] == '0' && name[i+1] != ']')
+ return -1;
+
*out_base_name_end = name + (i - 1);
return array_index;
}
More information about the mesa-commit
mailing list