Fix #12890 FP mismatchAllocDealloc with pointer to pointer

danmar · Jul 13, 2024 · 3401f22 · 3401f22
1 parent 7aa5e4a
commit 3401f22
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -67,10 +67,12 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         return No;
     if (tok2->str() == "::")
         tok2 = tok2->next();
+    while (Token::Match(tok2, "%name% :: %type%"))
+        tok2 = tok2->tokAt(2);
     if (!tok2->isName())
         return No;
 
-    if (!Token::Match(tok2, "%name% ::|. %type%")) {
+    if (!Token::Match(tok2, "%name% . %type%")) {
         // Using realloc..
         AllocType reallocType = getReallocationType(tok2, varid);
         if (reallocType != No)
@@ -124,7 +126,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
         }
     }
 
-    while (Token::Match(tok2,"%name% ::|. %type%"))
+    while (Token::Match(tok2,"%name% . %type%"))
         tok2 = tok2->tokAt(2);
 
     // User function

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -621,6 +621,19 @@ class TestLeakAutoVar : public TestFixture {
               "    delete[] li.front().m_p;\n"
               "}\n", true);
         ASSERT_EQUALS("", errout_str());
+
+        check("struct S {n" // #12890
+              "        int** p;n"
+              "    S() {n"
+              "        p = std::malloc(sizeof(int*));n"
+              "        p[0] = new int;n"
+              "    }n"
+              "    ~S() {n"
+              "        delete p[0];n"
+              "        std::free(p);n"
+              "    }n"
+              "};\n", true);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void assign26() {