Fix #12680 Assert failure in checkDereferenceInvalidIterator2() (#6366)

danmar · May 3, 2024 · 55c71f4 · 55c71f4
1 parent 50dc589
commit 55c71f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -2492,7 +2492,6 @@ void CheckStl::checkDereferenceInvalidIterator2()
             }
             if (cValue) {
                 const ValueFlow::Value& lValue = getLifetimeIteratorValue(tok, cValue->path);
-                assert(cValue->isInconclusive() || value.isInconclusive() || lValue.isLifetimeValue());
                 if (!lValue.isLifetimeValue())
                     continue;
                 if (emptyAdvance)

diff --git a/test/teststl.cpp b/test/teststl.cpp
@@ -5070,6 +5070,18 @@ class TestStl : public TestFixture {
               "}\n");
         ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Either the condition 'i+1!=s.end()' is redundant or there is possible dereference of an invalid iterator: i+1.\n",
                       errout_str());
+
+        check("void f(bool b, std::vector<std::string> v) {\n" // #12680
+              "    if (!v.empty()) {\n"
+              "        auto it = v.begin();\n"
+              "        if (b) {\n"
+              "            v.clear();\n"
+              "            it = v.begin();\n"
+              "        }\n"
+              "        for (++it; it != v.end(); ++it) {}\n"
+              "    }\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str()); // don't crash
     }
 
     void dereferenceInvalidIterator2() {