Fix 11076: Assert failure / crash with loop over init list (cppcheck-opensource#4119)

pfultz2 · web-flow · commit feaef46436d5 · 2022-05-21T08:25:09.000+02:00
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -2050,6 +2050,9 @@ T* getTokenArgumentFunctionImpl(T* tok, int& argn)
         tok = tok->link()->previous();
     if (!Token::Match(tok, "%name%|(|{"))
         return nullptr;
+    // Skip labels
+    if (Token::Match(tok, "%name% :"))
+        return nullptr;
     return tok;
 }
 
diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -6614,6 +6614,14 @@ class TestValueFlow : public TestFixture {
                "    }\n"
                "}\n";
         valueOfTok(code, "age");
+
+        code = "void a() {\n"
+               "  struct b {\n"
+               "    int d;\n"
+               "  };\n"
+               "  for (b c : {b{}, {}}) {}\n"
+               "}\n";
+        valueOfTok(code, "c");
     }
 
     void valueFlowHang() {

Original file line number	Diff line number	Diff line change
`@@ -2050,6 +2050,9 @@ T* getTokenArgumentFunctionImpl(T* tok, int& argn)`
`2050`	`2050`	`tok = tok->link()->previous();`
`2051`	`2051`	`if (!Token::Match(tok, "%name%\|(\|{"))`
`2052`	`2052`	`return nullptr;`
	`2053`	`+ // Skip labels`
	`2054`	`+ if (Token::Match(tok, "%name% :"))`
	`2055`	`+ return nullptr;`
`2053`	`2056`	`return tok;`
`2054`	`2057`	`}`
`2055`	`2058`