Fix #13108 FP invalidContainer when constructing container from itera…

…tors
danmar · Sep 18, 2024 · 9a5bf66 · 9a5bf66
1 parent d8debc2
commit 9a5bf66
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -1971,7 +1971,7 @@ static void valueFlowLifetimeConstructor(Token* tok, const TokenList& tokenlist,
             if (args.size() == 1 && vt.container->view && astIsContainerOwned(args.front())) {
                 LifetimeStore{args.front(), "Passed to container view.", ValueFlow::Value::LifetimeKind::SubObject}
                 .byRef(tok, tokenlist, errorLogger, settings);
-            } else if (args.size() == 2 && astIsIterator(args[0]) && astIsIterator(args[1])) {
+            } else if (args.size() == 2 && (astIsIterator(args[0]) || astIsIterator(args[1]))) {
                 LifetimeStore::forEach(
                     tokenlist,
                     errorLogger,

diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -6308,6 +6308,15 @@ class TestStl : public TestFixture {
               "}\n",
               true);
         ASSERT_EQUALS("", errout_str());
+
+        check("void f(std::vector<int>& v) {\n" // #13108
+              "    auto it = unknown(v);\n"
+              "    auto w = std::vector<int>{ it, v.end() };\n"
+              "    v.erase(it, v.end());\n"
+              "    for (const auto& i : w) {}\n"
+              "}\n",
+              true);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void invalidContainerLoop() {