Uninitialized variables: bailout when ({..}) are used to avoid fp. it can be handled better.

danmar · danmar · commit f2e5fbd30ddc · 2015-01-06T07:44:04.000+01:00
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
@@ -1424,6 +1424,11 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,
             return true;
         }
 
+        // bailout if there is ({
+        if (Token::simpleMatch(tok, "( {")) {
+            return true;
+        }
+
         // bailout if there is assembler code
         if (Token::simpleMatch(tok, "asm (")) {
             return true;
diff --git a/lib/executionpath.cpp b/lib/executionpath.cpp
@@ -145,6 +145,12 @@ void ExecutionPath::checkScope(const Token *tok, std::list<ExecutionPath *> &che
             return;
         }
 
+        // ({ is not handled well
+        if (Token::simpleMatch(tok, "( {")) {
+            ExecutionPath::bailOut(checks);
+            return;
+        }
+
         if (Token::simpleMatch(tok, "union {")) {
             tok = tok->next()->link();
             continue;
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -905,6 +905,20 @@ class TestUninitVar : public TestFixture {
                         "}");
         ASSERT_EQUALS("", errout.str());
 
+        // ({ .. })
+        {
+            const char code[] = "void f() {\n"
+                                "    int x;\n"
+                                "    if (abc) { x = 123; }\n"
+                                "    else { a = ({b=c;}); x = 456; }\n"
+                                "    ++x;\n"
+                                "}";
+            checkUninitVar(code);
+            ASSERT_EQUALS("", errout.str());
+            checkUninitVar2(code);
+            ASSERT_EQUALS("", errout.str());
+        }
+
         // Ticket #3098 - False negative uninitialized variable
         checkUninitVar("void f()\n"
                        "{\n"
