Fix issue if both "if" branches terminated by return.

1 files changed, 12 insertions, 0 deletions

diff --git a/src/analysis/statement.cpp b/src/analysis/statement.cpp
index f83d849..335df2b 100644
--- a/src/analysis/statement.cpp
+++ b/src/analysis/statement.cpp
@@ -103,8 +103,20 @@ void analyseIfStmt(IfStmtNode *node, const WalkItem &wi, WalkItem &wo)
         }
     }
 
+    // special case where all branches is ended.
+    if (returned && wo.isReturned)
+    {
+        FOR_EACH (std::set<std::string>::const_iterator,
+                  it,
+                  wo.checkNullVars)
+        {
+            wo.removeNullVars.insert(*it);
+        }
+    }
+
     wo.stopWalking = true;
     wo.isReturned = false;
+
 }
 
 }