Fix FP assertWithSideEffect with std::prev/next (refs #12695) (#6395)

danmar · May 11, 2024 · 8e7f060 · 8e7f060
1 parent 1943b4d
commit 8e7f060
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/cfg/std.cfg b/cfg/std.cfg
@@ -8201,6 +8201,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
+    <container yields="iterator"/>
     <arg nr="1" direction="in">
       <not-uninit/>
     </arg>
@@ -8215,6 +8216,7 @@ initializer list (7) string& replace (const_iterator i1, const_iterator i2, init
     <noreturn>false</noreturn>
     <use-retval/>
     <leak-ignore/>
+    <container yields="iterator"/>
     <arg nr="1" direction="in">
       <not-uninit/>
     </arg>

diff --git a/lib/checkassert.cpp b/lib/checkassert.cpp
@@ -70,8 +70,9 @@ void CheckAssert::assertWithSideEffects()
                         continue;
                     if (tmp->str() == "get" && Token::simpleMatch(tmp->astParent(), ".") && astIsSmartPointer(tmp->astParent()->astOperand1()))
                         continue;
-                    if (f->containerYield == Library::Container::Yield::START_ITERATOR || // bailout for std::begin/end
-                        f->containerYield == Library::Container::Yield::END_ITERATOR)
+                    if (f->containerYield == Library::Container::Yield::START_ITERATOR || // bailout for std::begin/end/prev/next
+                        f->containerYield == Library::Container::Yield::END_ITERATOR ||
+                        f->containerYield == Library::Container::Yield::ITERATOR)
                         continue;
                     sideEffectInAssertError(tmp, mSettings->library.getFunctionName(tmp));
                 }

diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
@@ -5041,3 +5041,9 @@ void assertWithSideEffect_std_begin(const std::vector<std::string>& v) {
         return a.size() < b.size();
     })); // cppcheck-suppress checkLibraryNoReturn
 }
+
+void assertWithSideEffect_std_prev_next(const std::vector<int>& v, std::vector<int>::const_iterator it) {
+    assert(std::prev(it, 1) == v.begin());
+    // cppcheck-suppress checkLibraryNoReturn
+    assert(std::next(it, 1) == v.end());
+}
diff --git a/test/testautovariables.cpp b/test/testautovariables.cpp
@@ -2442,7 +2442,7 @@ class TestAutoVariables : public TestFixture {
               "    return std::next(it);\n"
               "}");
         ASSERT_EQUALS(
-            "[test.cpp:3] -> [test.cpp:4] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning object that points to local variable 'x' that will be invalid when returning.\n",
+            "[test.cpp:3] -> [test.cpp:2] -> [test.cpp:4]: (error) Returning iterator to local container 'x' that will be invalid when returning.\n",
             errout_str());
 
         check("auto f() {\n"