diff options
author | Brian Paul <brianp@vmware.com> | 2010-01-08 08:21:12 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-01-08 08:21:12 -0700 |
commit | fd70841121475d7aad98812d6bf9c9c67567b89a (patch) | |
tree | 13f7eef837abc0151dc663a2b6fed04d7f2cc578 /progs/glsl | |
parent | a1de400e8de06a80ab140bb0fa950e990607572d (diff) | |
parent | 674c76310fe93dd3d7a15af0f72bb9f04351d09f (diff) |
Merge branch 'mesa_7_7_branch'
Conflicts:
src/mesa/drivers/dri/i965/brw_wm_emit.c
Diffstat (limited to 'progs/glsl')
-rw-r--r-- | progs/glsl/shtest.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/progs/glsl/shtest.c b/progs/glsl/shtest.c index e9800c307f3..7b1917be1ce 100644 --- a/progs/glsl/shtest.c +++ b/progs/glsl/shtest.c @@ -549,6 +549,10 @@ ReadConfigFile(const char *filename, struct config_file *conf) type = TypeFromName(typeName); + if (strlen(name) + 1 > sizeof(conf->uniforms[conf->num_uniforms].name)) { + fprintf(stderr, "string overflow\n"); + exit(1); + } strcpy(conf->uniforms[conf->num_uniforms].name, name); conf->uniforms[conf->num_uniforms].value[0] = v1; conf->uniforms[conf->num_uniforms].value[1] = v2; |