Fix #13051 FP unreadVariable when nulling deleted pointer (regression) (#6949)

Author: chrchr-github

Diff for: lib/checkmemoryleak.cpp

@@ -87,7 +87,7 @@ CheckMemoryLeak::AllocType CheckMemoryLeak::getAllocationType(const Token *tok2,
             while (Token::Match(typeTok, "%name% :: %name%"))
                 typeTok = typeTok->tokAt(2);
             const Scope* classScope = nullptr;
-            if (typeTok->type() && typeTok->type()->isClassType()) {
+            if (typeTok->type() && (typeTok->type()->isClassType() || typeTok->type()->isStructType() || typeTok->type()->isUnionType())) {
                 classScope = typeTok->type()->classScope;
             } else if (typeTok->function() && typeTok->function()->isConstructor()) {
                 classScope = typeTok->function()->nestedIn;

Diff for: lib/symboldatabase.cpp

@@ -5716,6 +5716,8 @@ const Function* Scope::findFunction(const Token *tok, bool requireConst, Referen
             const Function *func = it->second;
             if (ref == Reference::LValue && func->hasRvalRefQualifier())
                 continue;
+            if (func->isDestructor() && !Token::simpleMatch(tok->tokAt(-1), "~"))
+                continue;
             if (!isCall || args == func->argCount() ||
                 (func->isVariadic() && args >= (func->minArgCount() - 1)) ||
                 (args < func->argCount() && args >= func->minArgCount())) {

Diff for: test/testsymboldatabase.cpp

@@ -520,6 +520,7 @@ class TestSymbolDatabase : public TestFixture {
         TEST_CASE(findFunction54);
         TEST_CASE(findFunction55); // #13004
         TEST_CASE(findFunction56);
+        TEST_CASE(findFunction57);
         TEST_CASE(findFunctionRef1);
         TEST_CASE(findFunctionContainer);
         TEST_CASE(findFunctionExternC);
@@ -8349,6 +8350,30 @@ class TestSymbolDatabase : public TestFixture {
         ASSERT_EQUALS(f->function()->tokenDef->linenr(), 1);
     }
 
+    void findFunction57() { // #13051
+        GET_SYMBOL_DB("struct S {\n"
+                      "    ~S();\n"
+                      "    void f();\n"
+                      "};\n"
+                      "struct T {\n"
+                      "    T();\n"
+                      "};\n"
+                      "void S::f() {\n"
+                      "    auto s1 = new S;\n"
+                      "    auto s2 = new S();\n"
+                      "    auto t = new T();\n"
+                      "}\n");
+        const Token* S = Token::findsimplematch(tokenizer.tokens(), "S ;");
+        ASSERT(S && S->type());
+        ASSERT_EQUALS(S->type()->classDef->linenr(), 1);
+        S = Token::findsimplematch(S, "S (");
+        ASSERT(S && S->type());
+        ASSERT_EQUALS(S->type()->classDef->linenr(), 1);
+        const Token* T = Token::findsimplematch(S, "T (");
+        ASSERT(T && T->function());
+        ASSERT_EQUALS(T->function()->tokenDef->linenr(), 6);
+    }
+
     void findFunctionRef1() {
         GET_SYMBOL_DB("struct X {\n"
                       "    const std::vector<int> getInts() const & { return mInts; }\n"