fix COND_EXPR for C code.

In C code COND_EXPR used like IF_STMT in C++.

1 files changed, 37 insertions, 0 deletions

diff --git a/src/analysis/expression.cpp b/src/analysis/expression.cpp
index c3d97cf..9f21577 100644
--- a/src/analysis/expression.cpp
+++ b/src/analysis/expression.cpp
@@ -261,6 +261,43 @@ void analyseCondExpr(CondExprNode *node, const WalkItem &wi, WalkItem &wo)
     // need check for cleanExpr?
     intersectNonNullChecked(wo, wo2, wo3);
 
+    wo.removeNullVars.clear();
+
+    if (wo2.isReturned)
+    {
+        // add variable for ignore for all parent nodes except special like IF_STMT
+        FOR_EACH (std::set<std::string>::const_iterator,
+                  it,
+                  wo1.checkedNullVars)
+        {
+            wo.removeNullVars.insert(*it);
+            wo.checkNullVars.erase(*it);
+        }
+    }
+    if (wo3.isReturned)
+    {
+        // add variable for ignore for all parent nodes except special like IF_STMT
+        FOR_EACH (std::set<std::string>::const_iterator,
+                  it,
+                  wo1.checkedNonNullVars)
+        {
+            wo.removeNullVars.insert(*it);
+            wo.checkNullVars.erase(*it);
+        }
+    }
+
+    if (wo2.isReturned && wo3.isReturned)
+    {
+        // add variable for ignore for all parent nodes except special like IF_STMT
+        FOR_EACH (std::set<std::string>::const_iterator,
+                  it,
+                  wo1.checkedNullVars)
+        {
+            wo.removeNullVars.insert(*it);
+        }
+    }
+
+    wo.isReturned = false;
     wo.cleanExpr = true;
     wo.stopWalking = true;
     wo.uselessExpr = false;