From: Eric Anholt <eric@anholt.net>
Date: Wed, 7 Jul 2010 16:07:09 +0000 (-0700)
Subject: glsl2: Avoid null deref in scalar constant unop expressions.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=570dc0d4004bf09d257b3e4c8664d3c26a8af510;p=mesa.git

glsl2: Avoid null deref in scalar constant unop expressions.
---

diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 541398a91c7..98cbb6cec6c 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -151,7 +151,12 @@ ir_constant_visitor::visit(ir_expression *ir)
     */
    unsigned c0_inc = op0_scalar ? 1 : 0;
    unsigned c1_inc = op1_scalar ? 1 : 0;
-   unsigned components = op[op1_scalar ? 0 : 1]->type->components();
+   unsigned components;
+   if (op1_scalar || !op[1]) {
+      components = op[0]->type->components();
+   } else {
+      components = op[1]->type->components();
+   }
 
    switch (ir->operation) {
    case ir_unop_logic_not: