Mesa (master): glsl: Fix segfault due to missing printf argument

[Chad Versace]

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

Author: Chad Versace <chad.vers...@intel.com>
Date:   Tue Jan 18 15:15:19 2011 -0800

glsl: Fix segfault due to missing printf argument

Fixes the following Piglit tests:
glslparsertest/shaders/array2.frag
glslparsertest/shaders/dataType6.frag

NOTE: This is a candidate for the 7.9 and 7.10 branches.

---

 src/glsl/ast_to_hir.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
index 477efad..7a171f3 100644
--- a/src/glsl/ast_to_hir.cpp
+++ b/src/glsl/ast_to_hir.cpp
@@ -2509,7 +2509,8 @@ ast_declarator_list::hir(exec_list *instructions,
        */
       if (this->type->qualifier.flags.q.constant && decl->initializer == NULL) 
{
         _mesa_glsl_error(& loc, state,
-                         "const declaration of `%s' must be initialized");
+                         "const declaration of `%s' must be initialized",
+                         decl->identifier);
       }
 
       /* Check if this declaration is actually a re-declaration, either to

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit