leakNoReturnVar: Don't break early (danmar#2095)

rikardfalkeborn · danmar · commit fd3cb2497364 · 2019-08-23T06:33:00.000+02:00
There seems to be no reason for stopping checking the scope if a call to
free() is seen (or fclose() or realloc()), so just continue checking.
Also, if there are multiple arguments, check all, perhaps there are more
memory leaks to warn about.
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
@@ -1000,7 +1000,7 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
             functionName == "free" ||
             functionName == "fclose" ||
             functionName == "realloc")
-            break;
+            continue;
 
         if (!CheckMemoryLeakInFunction::test_white_list(functionName, mSettings, mTokenizer->isCPP()))
             continue;
@@ -1016,7 +1016,6 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)
             if (isReopenStandardStream(arg))
                 continue;
             functionCallLeak(arg, arg->str(), functionName);
-            break;
         }
 
     }
diff --git a/test/testmemleak.cpp b/test/testmemleak.cpp
@@ -2159,6 +2159,18 @@ class TestMemleakNoVar : public TestFixture {
               "    return ret;\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f() {\n"
+              "    free(malloc(1));\n"
+              "    strcpy(a, strdup(p));\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:3]: (error) Allocation with strdup, strcpy doesn't release it.\n", errout.str());
+
+        check("void f() {\n"
+              "    memcmp(calloc(10, 10), strdup(q), 100);\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:2]: (error) Allocation with calloc, memcmp doesn't release it.\n"
+                      "[test.cpp:2]: (error) Allocation with strdup, memcmp doesn't release it.\n", errout.str());
     }
 
     void missingAssignment() {

Original file line number	Diff line number	Diff line change
`@@ -1000,7 +1000,7 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)`
`1000`	`1000`	`functionName == "free" \|\|`
`1001`	`1001`	`functionName == "fclose" \|\|`
`1002`	`1002`	`functionName == "realloc")`
`1003`		`- break;`
	`1003`	`+ continue;`
`1004`	`1004`
`1005`	`1005`	`if (!CheckMemoryLeakInFunction::test_white_list(functionName, mSettings, mTokenizer->isCPP()))`
`1006`	`1006`	`continue;`
`@@ -1016,7 +1016,6 @@ void CheckMemoryLeakNoVar::checkForUnreleasedInputArgument(const Scope *scope)`
`1016`	`1016`	`if (isReopenStandardStream(arg))`
`1017`	`1017`	`continue;`
`1018`	`1018`	`functionCallLeak(arg, arg->str(), functionName);`
`1019`		`- break;`
`1020`	`1019`	`}`
`1021`	`1020`
`1022`	`1021`	`}`