[Mesa-dev] [PATCH] glsl: do not attempt assignment if operand type not parsed correctly

Tapani Pälli tapani.palli at intel.com
Mon Sep 24 13:23:54 UTC 2018


Cc: mesa-stable at lists.freedesktop.org
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=108012
---
 src/compiler/glsl/ast_to_hir.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/compiler/glsl/ast_to_hir.cpp b/src/compiler/glsl/ast_to_hir.cpp
index 93e7c8ec334..1b0ea1282b7 100644
--- a/src/compiler/glsl/ast_to_hir.cpp
+++ b/src/compiler/glsl/ast_to_hir.cpp
@@ -1685,6 +1685,11 @@ ast_expression::do_hir(exec_list *instructions,
       op[1] = this->subexpressions[1]->hir(instructions, state);
 
       orig_type = op[0]->type;
+
+      /* Break out if op[0] type has not been parsed successfully. */
+      if (orig_type == glsl_type::error_type)
+         break;
+
       type = arithmetic_result_type(op[0], op[1],
                                     (this->oper == ast_mul_assign),
                                     state, & loc);
-- 
2.17.1



More information about the mesa-dev mailing list