From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 2 Sep 2010 02:44:25 +0000 (-0700)
Subject: glsl: Reject structure constructors that have too many arguments.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cfe0dd5622a9b26e6df18801413ad8dc336f0c56;p=mesa.git

glsl: Reject structure constructors that have too many arguments.

Fixes piglit test constructor-27.vert.
---

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 1cd300c382d..c3b4441435f 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -1207,6 +1207,12 @@ ast_function_expression::hir(exec_list *instructions,
 	    node = node->next;
 	 }
 
+	 if (!node->is_tail_sentinel()) {
+	    _mesa_glsl_error(&loc, state, "too many parameters in constructor "
+			     "for `%s'", type->name);
+	    return ir_call::get_error_instruction(ctx);
+	 }
+
 	 ir_rvalue *const constant =
 	    constant_record_constructor(type, &actual_parameters, state);