From: Eric Anholt <eric@anholt.net>
Date: Tue, 27 Jul 2010 19:10:50 +0000 (-0700)
Subject: glsl2: Don't dereference a NULL var in CE handling during a compile error.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=54f583a20;p=mesa.git

glsl2: Don't dereference a NULL var in CE handling during a compile error.

If an undeclared variable was dereferenced in an expression that
needed constant expression handling, we would walk off a null ir->var
pointer.

Fixes:
glsl1-TIntermediate::addUnaryMath
---

diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index f15530ae89e..6a07f4e1895 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -676,6 +676,10 @@ ir_swizzle::constant_expression_value()
 ir_constant *
 ir_dereference_variable::constant_expression_value()
 {
+   /* This may occur during compile and var->type is glsl_type::error_type */
+   if (!var)
+      return NULL;
+
    return var->constant_value ? var->constant_value->clone(NULL) : NULL;
 }