Fix #12239 FP memleak when passing this in allocation (danmar#5719)

chrchr-github · Dec 2, 2023 · ae27b61 · ae27b61
1 parent ec9dbb3
commit ae27b61
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -263,7 +263,7 @@ static bool isLocalVarNoAutoDealloc(const Token *varTok, const bool isCpp)
     // non-pod variable
     if (isCpp) {
         // Possibly automatically deallocated memory
-        if (isAutoDealloc(var) && Token::Match(varTok, "%var% = new"))
+        if (isAutoDealloc(var) && Token::Match(varTok, "%var% [=({] new"))
             return false;
         if (!var->isPointer() && !var->typeStartToken()->isStandardType())
             return false;

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -580,6 +580,20 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("[test.cpp:4]: (error) Memory leak: p\n"
                       "[test.cpp:4]: (error) Memory leak: q\n",
                       errout.str());
+
+        check("struct S : B {\n" // #12239
+              "    void f();\n"
+              "    void g();\n"
+              "};\n"
+              "void S::f() {\n"
+              "    FD* fd(new FD(this));\n"
+              "    fd->exec();\n"
+              "}\n"
+              "void S::g() {\n"
+              "    FD* fd{ new FD(this) };\n"
+              "    fd->exec();\n"
+              "}\n", true);
+        ASSERT_EQUALS("", errout.str());
     }
 
     void isAutoDealloc() {