Fixed cppcheck-opensource#4837 (False positive: Assert statement calls a function which may have desired side effects (local variable))

zingsheim · zingsheim · commit aa25d1e0afd1 · 2013-06-05T22:10:43.000+02:00
diff --git a/lib/checkassert.cpp b/lib/checkassert.cpp
@@ -68,7 +68,7 @@ void CheckAssert::assertWithSideEffects()
                 for (const Token *tok2 = scope->classStart; tok2 != scope->classEnd; tok2 = tok2->next()) {
                     if (tok2->type() != Token::eAssignmentOp && tok2->type() != Token::eIncDecOp) continue;
                     const Variable* var = tok2->previous()->variable();
-                    if (!var) continue;
+                    if (!var || var->isLocal()) continue;
 
                     std::vector<const Token*> returnTokens; // find all return statements
                     for (const Token *rt = scope->classStart; rt != scope->classEnd; rt = rt->next()) {
diff --git a/test/testassert.cpp b/test/testassert.cpp
@@ -68,6 +68,15 @@ class TestAssert : public TestFixture {
             "assert(foo() == 3); \n"
         );
         ASSERT_EQUALS("", errout.str());
+
+        check(
+            "int foo(int a) {\n"
+            "    int b=a+1;\n"
+            "    return b;\n"
+            "}\n"
+            "assert(foo(1) == 2); \n"
+        );
+        ASSERT_EQUALS("", errout.str());
     }
 
     void functionCallInAssert() {
@@ -138,4 +147,4 @@ class TestAssert : public TestFixture {
     }
 };
 
-REGISTER_TEST(TestAssert)
+REGISTER_TEST(TestAssert)
