From acc1566f642c44c7de9d8b33a6ed553c5b172803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Sat, 25 Jul 2015 17:55:01 +0200
Subject: [PATCH] uninitvar: Improved condition handling. Fixes one problem
 when running 'tools/run_more_tests.sh test/testuninitvar.cpp'

---
 lib/checkuninitvar.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 18bcf1585..0c2ad6560 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -278,12 +278,14 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
 
             // checking if a not-zero variable is zero => bail out
             unsigned int condVarId = 0, condVarValue = 0;
-            if (Token::Match(tok, "if ( %name% )")) {
-                std::map<unsigned int,int>::const_iterator it = variableValue.find(tok->tokAt(2)->varId());
+            const Token *condVarTok = nullptr;
+            if (Token::simpleMatch(tok, "if (") &&
+                Token::isVariableComparison(tok->next()->astOperand2(), "!=", "0", &condVarTok)) {
+                std::map<unsigned int,int>::const_iterator it = variableValue.find(condVarTok->varId());
                 if (it != variableValue.end() && it->second == NOT_ZERO)
                     return true;   // this scope is not fully analysed => return true
                 else {
-                    condVarId = tok->tokAt(2)->varId();
+                    condVarId = condVarTok->varId();
                     condVarValue = NOT_ZERO;
                 }
             }