Fix a null pointer dereference error due to state caching in a loop involving

sending a message to a nil receiver.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68686 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 6 insertions, 7 deletions

diff --git a/lib/Analysis/GRExprEngine.cpp b/lib/Analysis/GRExprEngine.cpp
index 1fb7e5d966..7c928f39ba 100644
--- a/lib/Analysis/GRExprEngine.cpp
+++ b/lib/Analysis/GRExprEngine.cpp
@@ -1704,10 +1704,8 @@ void GRExprEngine::VisitObjCMessageExprDispatchHelper(ObjCMessageExpr* ME,
             N->markAsSink();
             if (isFeasibleNotNull)
               NilReceiverStructRetImplicit.insert(N);
-            else {
+            else
               NilReceiverStructRetExplicit.insert(N);            
-              return;
-            }
           }
         }
       }
@@ -1725,10 +1723,8 @@ void GRExprEngine::VisitObjCMessageExprDispatchHelper(ObjCMessageExpr* ME,
                 N->markAsSink();
                 if(isFeasibleNotNull)
                   NilReceiverLargerThanVoidPtrRetImplicit.insert(N);
-                else {
+                else
                   NilReceiverLargerThanVoidPtrRetExplicit.insert(N);            
-                  return;
-                }
               }
             }
             else if (!isFeasibleNotNull) {
@@ -1753,7 +1749,10 @@ void GRExprEngine::VisitObjCMessageExprDispatchHelper(ObjCMessageExpr* ME,
         }
       }
       // We have handled the cases where the receiver is nil.  The remainder
-      // of this method should assume that the receiver is not nil.      
+      // of this method should assume that the receiver is not nil.
+      if (!StNotNull)
+        return;
+       
       state = StNotNull;
     }