Fix #12321 FP doubleFree within lambda (danmar#5844)

chrchr-github · Jan 5, 2024 · fde7ea6 · fde7ea6
1 parent 44ed533
commit fde7ea6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
@@ -1048,6 +1048,9 @@ void CheckLeakAutoVar::functionCall(const Token *tokName, const Token *tokOpenin
             const Token* const nextArg = funcArg->nextArgument();
             while (arg && ((nextArg && arg != nextArg) || (!nextArg && arg != tokOpeningPar->link()))) {
                 checkTokenInsideExpression(arg, varInfo, /*inFuncCall*/ isLeakIgnore);
+
+                if (isLambdaCaptureList(arg))
+                    break;
                 arg = arg->next();
             }
         }

diff --git a/test/testleakautovar.cpp b/test/testleakautovar.cpp
@@ -986,6 +986,20 @@ class TestLeakAutoVar : public TestFixture {
               "    FOREACH(callables, ());\n"
               "}\n");
         ASSERT_EQUALS("[test.c:2]: (information) --check-library: Function FOREACH() should have <noreturn> configuration\n", errout.str()); // don't crash
+
+        check("int f() {\n" // #12321
+              "    std::invoke([](int i) {\n"
+              "        int* p = (int*)malloc(4);\n"
+              "        *p = 0;\n"
+              "        if (i) {\n"
+              "            free(p);\n"
+              "            return;\n"
+              "        }\n"
+              "        free(p);\n"
+              "    }, 1);\n"
+              "    return 0;\n"
+              "}\n", /*cpp*/ true);
+        ASSERT_EQUALS("", errout.str());
     }
 
     void doublefree1() {  // #3895