Mesa (master): glsl: Fix null check in read_dereference.

Vinson Lee vlee at kemper.freedesktop.org
Fri Jun 14 05:17:42 UTC 2013


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

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Thu Jun  6 23:07:30 2013 -0700

glsl: Fix null check in read_dereference.

Fixes "Logically dead code" defect reported by Coverity.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/glsl/ir_reader.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ir_reader.cpp b/src/glsl/ir_reader.cpp
index b366712..51534ca 100644
--- a/src/glsl/ir_reader.cpp
+++ b/src/glsl/ir_reader.cpp
@@ -886,7 +886,7 @@ ir_reader::read_dereference(s_expression *expr)
       }
 
       ir_rvalue *idx = read_rvalue(s_index);
-      if (subject == NULL) {
+      if (idx == NULL) {
 	 ir_read_error(NULL, "when reading the index of an array_ref");
 	 return NULL;
       }




More information about the mesa-commit mailing list