ExprEngine; Fix TODO assertion

danmar · danmar · commit f516bde74487 · 2020-06-19T14:05:19.000+02:00
diff --git a/lib/exprengine.cpp b/lib/exprengine.cpp
@@ -1926,6 +1926,7 @@ static void execute(const Token *start, const Token *end, Data &data)
                     tok = tok->tokAt(2);
                     continue;
                 }
+                data.assignValue(tok, tok->varId(), createVariableValue(*tok->variable(), data));
             } else if (tok->variable()->isArray()) {
                 data.assignValue(tok, tok->varId(), std::make_shared<ExprEngine::ArrayValue>(&data, tok->variable()));
                 if (Token::Match(tok, "%name% ["))
diff --git a/test/testbughuntingchecks.cpp b/test/testbughuntingchecks.cpp
@@ -46,7 +46,7 @@ class TestBughuntingChecks : public TestFixture {
 
     void uninit() {
         check("void foo() { int x; x = x + 1; }");
-        TODO_ASSERT_EQUALS("[test.cpp:1]: (error) Cannot determine that 'x' is initialized\n", "", errout.str());
+        ASSERT_EQUALS("[test.cpp:1]: (error) Cannot determine that 'x' is initialized\n", errout.str());
 
         check("void foo() { int x; int y = x + 1; }");
         ASSERT_EQUALS("[test.cpp:1]: (error) Cannot determine that 'x' is initialized\n", errout.str());

Original file line number	Diff line number	Diff line change
`@@ -1926,6 +1926,7 @@ static void execute(const Token start, const Token end, Data &data)`
`1926`	`1926`	`tok = tok->tokAt(2);`
`1927`	`1927`	`continue;`
`1928`	`1928`	`}`
	`1929`	`+ data.assignValue(tok, tok->varId(), createVariableValue(*tok->variable(), data));`
`1929`	`1930`	`} else if (tok->variable()->isArray()) {`
`1930`	`1931`	`data.assignValue(tok, tok->varId(), std::make_shared<ExprEngine::ArrayValue>(&data, tok->variable()));`
`1931`	`1932`	`if (Token::Match(tok, "%name% ["))`