Skip to content

Fix #13401 (cppcheck-addon-ctu-file-list filename should be unique for each process) #7082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 3 commits into from
Dec 8, 2024
Merged

Fix #13401 (cppcheck-addon-ctu-file-list filename should be unique for each process) #7082

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8935acc
Fix #13401 (cppcheck-addon-ctu-file-list filename should be unique fo…
danmar Dec 8, 2024
979d271
executeAddons; Only create filelist if more than 1 file is processed.…
danmar Dec 8, 2024
b451c08
Update lib/cppcheck.cpp
danmar Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions lib/cppcheck.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1446,13 +1446,13 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
if (mSettings.addons.empty() || files.empty())
return;

FilesDeleter filesDeleter;
const bool isCtuInfo = endsWith(files[0], ".ctu-info");

FilesDeleter filesDeleter;
std::string fileList;

if (files.size() >= 2 || endsWith(files[0], ".ctu-info")) {
// TODO: can this conflict when using -j?
fileList = Path::getPathFromFilename(files[0]) + FILELIST;
if (files.size() >= 2) {
fileList = Path::getPathFromFilename(files[0]) + FILELIST + ("-" + std::to_string(mSettings.pid)) + ".txt";
std::ofstream fout(fileList);
filesDeleter.addFile(fileList);
// TODO: check if file could be created
Expand All @@ -1466,7 +1466,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
std::string ctuInfo;

for (const AddonInfo &addonInfo : mSettings.addonInfos) {
if (addonInfo.name != "misra" && !addonInfo.ctu && endsWith(files.back(), ".ctu-info"))
if (isCtuInfo && addonInfo.name != "misra" && !addonInfo.ctu)
continue;

const std::vector<picojson::value> results =
Expand Down Expand Up @@ -1532,7 +1532,7 @@ void CppCheck::executeAddons(const std::vector<std::string>& files, const std::s
}
}

if (!mSettings.buildDir.empty() && fileList.empty()) {
if (!mSettings.buildDir.empty() && !isCtuInfo) {
const std::string& ctuInfoFile = getCtuInfoFileName(files[0]);
std::ofstream fout(ctuInfoFile);
fout << ctuInfo;
Expand Down
Loading