fixed #12111 - memory leak with -j2 and --cppcheck-build-dir

danmar · Dec 16, 2023 · 833c105 · 833c105
1 parent 6550554
commit 833c105
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -1102,6 +1102,8 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
                 mAnalyzerInformation.setFileInfo("ctu", fi1->toString());
             if (mSettings.useSingleJob())
                 mFileInfo.push_back(fi1);
+            else
+                delete fi1;
         }
 
         // cppcheck-suppress shadowFunction - TODO: fix this
@@ -1114,6 +1116,8 @@ void CppCheck::checkNormalTokens(const Tokenizer &tokenizer)
                     mAnalyzerInformation.setFileInfo(check->name(), fi->toString());
                 if (mSettings.useSingleJob())
                     mFileInfo.push_back(fi);
+                else
+                    delete fi;
             }
         }
     }

diff --git a/test/cli/test-other.py b/test/cli/test-other.py
@@ -843,3 +843,19 @@ def test_file_ignore(tmpdir):
     ]
 
     assert_cppcheck(args, ec_exp=1, err_exp=[], out_exp=out_lines)
+
+
+def test_build_dir_j_memleak(tmpdir): #12111
+    build_dir = os.path.join(tmpdir, 'build-dir')
+    os.mkdir(build_dir)
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('int main() {}')
+
+    args = ['--cppcheck-build-dir={}'.format(build_dir), '-j2', test_file]
+    out_lines = [
+        'Checking {} ...'.format(test_file)
+    ]
+
+    assert_cppcheck(args, ec_exp=0, err_exp=[], out_exp=out_lines)