walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Cppcheck: Remove dumpfile and filelist file using RAII class to avoid that these files are forgotten in early returns or exceptions. (#5369)

This commit is contained in:
Daniel Marjamäki 2023-08-24 22:47:20 +02:00 committed by GitHub
parent 394996581e
commit 6017c254dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/cppcheck.cpp
View File

@ -88,6 +88,23 @@ static TimerResults s_timerResults;
// CWE ids used // CWE ids used
static const CWE CWE398(398U); // Indicator of Poor Code Quality static const CWE CWE398(398U); // Indicator of Poor Code Quality
// File deleter
namespace {
class FilesDeleter {
public:
FilesDeleter() = default;
~FilesDeleter() {
for (const std::string& fileName: mFilenames)
std::remove(fileName.c_str());
}
void addFile(const std::string& fileName) {
mFilenames.push_back(fileName);
}
private:
std::vector<std::string> mFilenames;
};
}
namespace { namespace {
struct AddonInfo { struct AddonInfo {
std::string name; std::string name;
@ -631,6 +648,8 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
{ {
mExitCode = 0; mExitCode = 0;
FilesDeleter filesDeleter;
if (Settings::terminated()) if (Settings::terminated())
return mExitCode; return mExitCode;
@ -774,6 +793,8 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
if (fdump.is_open()) { if (fdump.is_open()) {
fdump << dumpProlog.str(); fdump << dumpProlog.str();
dumpProlog.str(""); dumpProlog.str("");
if (!mSettings.dump)
filesDeleter.addFile(dumpFile);
} }
// Get directives // Get directives
@ -1404,8 +1425,6 @@ void CppCheck::executeAddons(const std::string& dumpFile)
if (!dumpFile.empty()) { if (!dumpFile.empty()) {
std::vector<std::string> f{dumpFile}; std::vector<std::string> f{dumpFile};
executeAddons(f); executeAddons(f);
if (!mSettings.dump)
std::remove(dumpFile.c_str());
} }
} }
@ -1414,10 +1433,13 @@ void CppCheck::executeAddons(const std::vector<std::string>& files)
if (mSettings.addons.empty() || files.empty()) if (mSettings.addons.empty() || files.empty())
return; return;
FilesDeleter filesDeleter;
std::string fileList; std::string fileList;
if (files.size() >= 2 || endsWith(files[0], ".ctu-info")) { if (files.size() >= 2 || endsWith(files[0], ".ctu-info")) {
fileList = Path::getPathFromFilename(files[0]) + FILELIST; fileList = Path::getPathFromFilename(files[0]) + FILELIST;
filesDeleter.addFile(fileList);
std::ofstream fout(fileList); std::ofstream fout(fileList);
for (const std::string& f: files) for (const std::string& f: files)
fout << f << std::endl; fout << f << std::endl;
@ -1487,9 +1509,6 @@ void CppCheck::executeAddons(const std::vector<std::string>& files)
reportErr(errmsg); reportErr(errmsg);
} }
} }
if (!fileList.empty())
std::remove(fileList.c_str());
} }
void CppCheck::executeAddonsWholeProgram(const std::map<std::string, std::size_t> &files) void CppCheck::executeAddonsWholeProgram(const std::map<std::string, std::size_t> &files)