LeakAutoVar: Handle C++ casts in function calls (cppcheck-opensource#5181)

chrchr-github · web-flow · commit fe56b0c42a6d · 2023-06-22T16:01:21.000+02:00
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -934,6 +934,8 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
         }
 
         // Skip casts
+        if (arg->isKeyword() && arg->astParent() && arg->astParent()->isCast())
+            arg = arg->astParent();
         while (arg && arg->isCast())
             arg = arg->astOperand2() ? arg->astOperand2() : arg->astOperand1();
         const Token * const argTypeStartTok = arg;
diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -564,6 +564,13 @@ class TestLeakAutoVar : public TestFixture {
               "    g();\n"
               "}\n", /*cpp*/ true);
         ASSERT_EQUALS("", errout.str());
+
+        check("void g() {}\n" // #10517
+              "void f() {\n"
+              "    char* p = malloc(10);\n"
+              "    g();\n"
+              "}\n");
+        ASSERT_EQUALS("[test.c:5]: (error) Memory leak: p\n", errout.str());
     }
 
     void isAutoDealloc() {
@@ -2751,6 +2758,20 @@ class TestLeakAutoVar : public TestFixture {
               "    free_func((void *)(1), buf);\n"
               "}", settingsFunctionCall);
         ASSERT_EQUALS("[test.cpp:5]: (information) --check-library: Function free_func() should have <use>/<leak-ignore> configuration\n", errout.str());
+
+        check("void g(void*);\n"
+              "void h(int, void*);\n"
+              "void f1() {\n"
+              "    int* p = new int;\n"
+              "    g(static_cast<void*>(p));\n"
+              "}\n"
+              "void f2() {\n"
+              "    int* p = new int;\n"
+              "    h(1, static_cast<void*>(p));\n"
+              "}\n", /*cpp*/ true);
+        ASSERT_EQUALS("[test.cpp:6]: (information) --check-library: Function g() should have <use>/<leak-ignore> configuration\n"
+                      "[test.cpp:10]: (information) --check-library: Function h() should have <use>/<leak-ignore> configuration\n",
+                      errout.str());
     }
 
     void functionCallLeakIgnoreConfig() { // #7923

Original file line number	Diff line number	Diff line change
`@@ -934,6 +934,8 @@ void CheckLeakAutoVar::functionCall(const Token tokName, const Token tokOpenin`
`934`	`934`	`}`
`935`	`935`
`936`	`936`	`// Skip casts`
	`937`	`+ if (arg->isKeyword() && arg->astParent() && arg->astParent()->isCast())`
	`938`	`+ arg = arg->astParent();`
`937`	`939`	`while (arg && arg->isCast())`
`938`	`940`	`arg = arg->astOperand2() ? arg->astOperand2() : arg->astOperand1();`
`939`	`941`	`const Token * const argTypeStartTok = arg;`