Mesa (master): glsl: Add null check in loop_analysis.cpp

Tapani Pälli tpalli at kemper.freedesktop.org
Fri May 30 04:24:01 UTC 2014


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

Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Date:   Thu Apr  3 16:51:14 2014 +0300

glsl: Add null check in loop_analysis.cpp

Check return value from hash_table_find before using it as a pointer

Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/loop_analysis.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/glsl/loop_analysis.cpp b/src/glsl/loop_analysis.cpp
index d6a9ac7..78ac300 100644
--- a/src/glsl/loop_analysis.cpp
+++ b/src/glsl/loop_analysis.cpp
@@ -589,8 +589,10 @@ get_basic_induction_increment(ir_assignment *ir, hash_table *var_hash)
 	 loop_variable *lv =
 	    (loop_variable *) hash_table_find(var_hash, inc_var);
 
-	 if (!lv->is_loop_constant())
-	    inc = NULL;
+         if (lv == NULL || !lv->is_loop_constant()) {
+            assert(lv != NULL);
+            inc = NULL;
+         }
       } else
 	 inc = NULL;
    }




More information about the mesa-commit mailing list