Mesa (master): mesa: In validate_program(), initialize errMsg for safety.

Kenneth Graunke kwg at kemper.freedesktop.org
Fri Aug 5 14:20:05 PDT 2011


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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Sat Jul 30 21:26:26 2011 -0700

mesa: In validate_program(), initialize errMsg for safety.

validate_program relies on validate_shader_program to fill in errMsg;
empirically, there exist cases where that doesn't happen.

While tracking those down may be worthwhile, initializing the string so
we don't try to ralloc_strdup random garbage also seems wise.

Fixes issues caught by valgrind while running some test case.

NOTE: This is a candidate for stable release branches.

Reviewed-by: Chad Versace <chad at chad-versace.us>
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/mesa/main/shaderapi.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 8df25c3..74997ea 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1125,7 +1125,7 @@ static void
 validate_program(struct gl_context *ctx, GLuint program)
 {
    struct gl_shader_program *shProg;
-   char errMsg[100];
+   char errMsg[100] = "";
 
    shProg = _mesa_lookup_shader_program_err(ctx, program, "glValidateProgram");
    if (!shProg) {



More information about the mesa-commit mailing list