Fix #12716 Assert failure in updateRange() (#6580)

danmar · Jul 10, 2024 · b9912e0 · b9912e0
1 parent 5a20a51
commit b9912e0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -825,6 +825,8 @@ static T* getCondTokImpl(T* tok)
         return tok->next()->astOperand2()->astOperand2()->astOperand1();
     if (Token::simpleMatch(tok->next()->astOperand2(), ";"))
         return tok->next()->astOperand2()->astOperand1();
+    if (tok->isName() && !tok->isControlFlowKeyword())
+        return nullptr;
     return tok->next()->astOperand2();
 }
 

diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -7467,6 +7467,16 @@ class TestValueFlow : public TestFixture {
 
         code = "void f() { int& a = *&a; }\n"; // #12511
         valueOfTok(code, "=");
+
+        code = "void g(int*);\n" // #12716
+               "void f(int a) {\n"
+               "    do {\n"
+               "        if (a)\n"
+               "            break;\n"
+               "        g((int[256]) { 0 });\n"
+               "    } while (true);\n"
+               "}\n";
+        valueOfTok(code, "0");
     }
 
     void valueFlowHang() {