From 9670ab08874057c37da2d15fb6f1d8339ffa343b Mon Sep 17 00:00:00 2001
From: Matt Pharr <matt.pharr@intel.com>
Date: Wed, 11 Jan 2012 09:09:40 -0800
Subject: [PATCH] Add missing cases to watch out for in lCheckAllOffSafety()

Previously, we weren't checking for member expressions that dereferenced
a pointer or pointer dereference expressions--only array indexing!
---
 expr.h   |  1 -
 stmt.cpp | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/expr.h b/expr.h
index c66b7754..48388475 100644
--- a/expr.h
+++ b/expr.h
@@ -314,7 +314,6 @@ public:
     std::string identifier;
     const SourcePos identifierPos;
 
-protected:
     MemberExpr(Expr *expr, const char *identifier, SourcePos pos, 
                SourcePos identifierPos, bool derefLValue);
 
diff --git a/stmt.cpp b/stmt.cpp
index 783d0a5d..5f23c98f 100644
--- a/stmt.cpp
+++ b/stmt.cpp
@@ -695,6 +695,23 @@ lCheckAllOffSafety(ASTNode *node, void *data) {
         }
 
         // All indices are in-bounds
+        return true;
+    }
+
+    MemberExpr *me;
+    if ((me = dynamic_cast<MemberExpr *>(node)) != NULL &&
+        me->dereferenceExpr) {
+        *okPtr = false;
+        return false;
+    }
+
+    DereferenceExpr *de;
+    if ((de = dynamic_cast<DereferenceExpr *>(node)) != NULL) {
+        const Type *exprType = de->expr->GetType();
+        if (dynamic_cast<const PointerType *>(exprType) != NULL) {
+            *okPtr = false;
+            return false;
+        }
     }
 
     return true;