Fix #12064 FP useStlAlgorithm with loop over initializer list (danmar…

…#5542)
chrchr-github · Oct 12, 2023 · 179d26f · 179d26f
1 parent e247e81
commit 179d26f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -2878,6 +2878,8 @@ void CheckStl::useStlAlgorithm()
                 loopVar = splitTok->previous();
                 if (loopVar->varId() == 0)
                     continue;
+                if (Token::simpleMatch(splitTok->astOperand2(), "{"))
+                    continue;
             }
             else { // iterator-based loop?
                 const Token* initTok = getInitTok(tok);

diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -5437,6 +5437,13 @@ class TestStl : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:2]: (style) Consider using std::any_of algorithm instead of a raw loop.\n",
                       errout.str());
+
+        check("void f() {\n" // #12064
+              "    for (const auto& animal : { \"cat\", \"bat\", \"tiger\", \"rat\" })\n"
+              "        if (std::strlen(animal) > 4)\n"
+              "            throw 1;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void loopAlgoMinMax() {