Fix #12590 FP: (regression) resourceLeak (#6235)

danmar · Apr 5, 2024 · 9deefe4 · 9deefe4
1 parent 2361df9
commit 9deefe4
Show file tree

Hide file tree

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

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -1046,6 +1046,14 @@ class TestLeakAutoVar : public TestFixture {
               "    return f;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("bool f() {\n" // #12590
+              "    FILE* fd = fopen(\"/foo/bar\", \"w\");\n"
+              "    if (fd == nullptr)\n"
+              "        return false;\n"
+              "    return fclose(fd) == 0;\n"
+              "}\n", /*cpp*/ true);
+        ASSERT_EQUALS("", errout_str());
     }
 
     void doublefree1() {  // #3895