Fix #12490 FP deallocret when returning bool

danmar · Mar 5, 2024 · 2ddd0d2 · 2ddd0d2
1 parent 2464a9d
commit 2ddd0d2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -1147,7 +1147,7 @@ void CheckLeakAutoVar::ret(const Token *tok, VarInfo &varInfo, const bool isEndO
                     tok2 = tok3;
                 else
                     continue;
-                if (Token::Match(tok2, "[});,+]")) {
+                if (Token::Match(tok2, "[});,+]") && !astIsBool(tok)) {
                     used = PtrUsage::PTR;
                     break;
                 }

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -113,6 +113,7 @@ class TestLeakAutoVar : public TestFixture {
         TEST_CASE(deallocuse12);
         TEST_CASE(deallocuse13);
         TEST_CASE(deallocuse14);
+        TEST_CASE(deallocuse15);
 
         TEST_CASE(doublefree1);
         TEST_CASE(doublefree2);
@@ -1036,6 +1037,15 @@ class TestLeakAutoVar : public TestFixture {
         ASSERT_EQUALS("", errout.str());
     }
 
+    void deallocuse15() {
+        check("bool FileExists(const char* filename) {\n" // #12490
+              "    FILE* f = fopen(filename, \"rb\");\n"
+              "    if (f) fclose(f);\n"
+              "    return f;\n"
+              "}\n");
+        ASSERT_EQUALS("", errout.str());
+    }
+
     void doublefree1() {  // #3895
         check("void f(char *p) {\n"
               "    if (x)\n"