Skip to content

Commit 729f929

Browse files
samopolaceksamopolacek
committed
Enable exceptions on ofstreams
1 parent a6b0129 commit 729f929

File tree

8 files changed

+107
-50
lines changed

8 files changed

+107
-50
lines changed

‎cli/cppcheckexecutor.cpp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#endif
4444

4545
#include <algorithm>
46+
#include <cassert>
4647
#include <cstdio>
4748
#include <cstdlib> // EXIT_SUCCESS and EXIT_FAILURE
4849
#include <functional>
@@ -75,7 +76,19 @@ CppCheckExecutor::CppCheckExecutor()
7576

7677
CppCheckExecutor::~CppCheckExecutor()
7778
{
78-
delete mErrorOutput;
79+
if (mErrorOutput) {
80+
try
81+
{
82+
mErrorOutput->close();
83+
}
84+
catch (const std::ios_base::failure&)
85+
{
86+
// TODO report error
87+
assert(false);
88+
}
89+
90+
delete mErrorOutput;
91+
}
7992
}
8093

8194
bool CppCheckExecutor::parseFromArgs(Settings &settings, int argc, const char* const argv[])
@@ -266,7 +279,9 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck)
266279
mLatestProgressOutputTime = std::time(nullptr);
267280

268281
if (!settings.outputFile.empty()) {
269-
mErrorOutput = new std::ofstream(settings.outputFile);
282+
mErrorOutput = new std::ofstream();
283+
mErrorOutput->exceptions(std::ios_base::failbit | std::ios_base::badbit);
284+
mErrorOutput->open(settings.outputFile);
270285
}
271286

272287
if (settings.xml) {

‎gui/checkthread.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ static bool executeCommand(std::string exe, std::vector<std::string> args, std::
7676
output = process.readAllStandardOutput().toStdString();
7777

7878
if (redirect.compare(0,3,"2> ") == 0) {
79-
std::ofstream fout(redirect.substr(3));
79+
std::ofstream fout;
80+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
81+
fout.open(redirect.substr(3));
8082
fout << process.readAllStandardError().toStdString();
8183
}
8284
return process.exitCode() == 0;

‎lib/analyzerinfo.cpp

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,27 @@
2323
#include "utils.h"
2424

2525
#include <tinyxml2.h>
26+
#include <cassert>
2627
#include <cstring>
2728
#include <map>
2829
#include <sstream> // IWYU pragma: keep
2930

31+
AnalyzerInformation::AnalyzerInformation()
32+
{
33+
mOutputStream.exceptions(std::ios_base::failbit | std::ios_base::badbit);
34+
}
35+
3036
AnalyzerInformation::~AnalyzerInformation()
3137
{
32-
close();
38+
try
39+
{
40+
close();
41+
}
42+
catch (const std::ios_base::failure&)
43+
{
44+
// TODO: Report error
45+
assert(false);
46+
}
3347
}
3448

3549
static std::string getFilename(const std::string &fullpath)
@@ -49,7 +63,9 @@ void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::
4963
std::map<std::string, unsigned int> fileCount;
5064

5165
const std::string filesTxt(buildDir + "/files.txt");
52-
std::ofstream fout(filesTxt);
66+
std::ofstream fout;
67+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
68+
fout.open(filesTxt);
5369
for (const std::string &f : sourcefiles) {
5470
const std::string afile = getFilename(f);
5571
fout << afile << ".a" << (++fileCount[afile]) << "::" << Path::simplifyPath(Path::fromNativeSeparators(f)) << '\n';
@@ -65,7 +81,6 @@ void AnalyzerInformation::writeFilesTxt(const std::string &buildDir, const std::
6581

6682
void AnalyzerInformation::close()
6783
{
68-
mAnalyzerInfoFile.clear();
6984
if (mOutputStream.is_open()) {
7085
mOutputStream << "</analyzerinfo>\n";
7186
mOutputStream.close();
@@ -139,12 +154,8 @@ bool AnalyzerInformation::analyzeFile(const std::string &buildDir, const std::st
139154
return false;
140155

141156
mOutputStream.open(mAnalyzerInfoFile);
142-
if (mOutputStream.is_open()) {
143-
mOutputStream << "<?xml version=\"1.0\"?>\n";
144-
mOutputStream << "<analyzerinfo hash=\"" << hash << "\">\n";
145-
} else {
146-
mAnalyzerInfoFile.clear();
147-
}
157+
mOutputStream << "<?xml version=\"1.0\"?>\n";
158+
mOutputStream << "<analyzerinfo hash=\"" << hash << "\">\n";
148159

149160
return true;
150161
}

‎lib/analyzerinfo.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ class ErrorMessage;
4949
*/
5050
class CPPCHECKLIB AnalyzerInformation {
5151
public:
52+
AnalyzerInformation();
5253
~AnalyzerInformation();
5354

5455
static void writeFilesTxt(const std::string &buildDir, const std::list<std::string> &sourcefiles, const std::string &userDefines, const std::list<ImportProject::FileSettings> &fileSettings);

‎lib/cppcheck.cpp

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,16 @@ static void createDumpFile(const Settings& settings,
276276
dumpFile = getDumpFileName(settings, filename);
277277

278278
fdump.open(dumpFile);
279+
280+
// TODO: Technically, exceptions are allowed on the file so this is always false,
281+
// TODO: but the function is not aware of that as this function is not the owner of the file
279282
if (!fdump.is_open())
280283
return;
281284

282285
{
283-
std::ofstream fout(getCtuInfoFileName(dumpFile));
286+
std::ofstream fout;
287+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
288+
fout.open(getCtuInfoFileName(dumpFile));
284289
}
285290

286291
std::string language;
@@ -396,7 +401,9 @@ CppCheck::CppCheck(ErrorLogger &errorLogger,
396401
, mTooManyConfigs(false)
397402
, mSimplify(true)
398403
, mExecuteCommand(std::move(executeCommand))
399-
{}
404+
{
405+
mPlistFile.exceptions(std::ios_base::failbit | std::ios_base::badbit);
406+
}
400407

401408
CppCheck::~CppCheck()
402409
{
@@ -408,7 +415,16 @@ CppCheck::~CppCheck()
408415

409416
if (mPlistFile.is_open()) {
410417
mPlistFile << ErrorLogger::plistFooter();
411-
mPlistFile.close();
418+
419+
try
420+
{
421+
mPlistFile.close();
422+
}
423+
catch (const std::ios_base::failure&)
424+
{
425+
// TODO report error
426+
assert(false);
427+
}
412428
}
413429
}
414430

@@ -504,7 +520,9 @@ unsigned int CppCheck::check(const std::string &path)
504520
const std::string args2 = "-fsyntax-only -Xclang -ast-dump -fno-color-diagnostics " + flags + path;
505521
const std::string redirect2 = analyzerInfo.empty() ? std::string("2>&1") : ("2> " + clangStderr);
506522
if (!mSettings.buildDir.empty()) {
507-
std::ofstream fout(clangcmd);
523+
std::ofstream fout;
524+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
525+
fout.open(clangcmd);
508526
fout << exe << " " << args2 << " " << redirect2 << std::endl;
509527
} else if (mSettings.verbose && !mSettings.quiet) {
510528
mErrorLogger.reportOut(exe + " " + args2);
@@ -535,7 +553,9 @@ unsigned int CppCheck::check(const std::string &path)
535553
}
536554

537555
if (!mSettings.buildDir.empty()) {
538-
std::ofstream fout(clangAst);
556+
std::ofstream fout;
557+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
558+
fout.open(clangAst);
539559
fout << output2 << std::endl;
540560
}
541561

@@ -555,6 +575,7 @@ unsigned int CppCheck::check(const std::string &path)
555575

556576
// create dumpfile
557577
std::ofstream fdump;
578+
fdump.exceptions(std::ios_base::failbit | std::ios_base::badbit);
558579
std::string dumpFile;
559580
createDumpFile(mSettings, path, fdump, dumpFile);
560581
if (fdump.is_open()) {
@@ -773,6 +794,7 @@ unsigned int CppCheck::checkFile(const std::string& filename, const std::string
773794

774795
// write dump file xml prolog
775796
std::ofstream fdump;
797+
fdump.exceptions(std::ios_base::failbit | std::ios_base::badbit);
776798
std::string dumpFile;
777799
createDumpFile(mSettings, filename, fdump, dumpFile);
778800
if (fdump.is_open()) {
@@ -1422,7 +1444,9 @@ void CppCheck::executeAddons(const std::vector<std::string>& files)
14221444

14231445
if (files.size() >= 2 || endsWith(files[0], ".ctu-info")) {
14241446
fileList = Path::getPathFromFilename(files[0]) + FILELIST;
1425-
std::ofstream fout(fileList);
1447+
std::ofstream fout;
1448+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
1449+
fout.open(fileList);
14261450
for (const std::string& f: files)
14271451
fout << f << std::endl;
14281452
}
@@ -1681,7 +1705,10 @@ void CppCheck::analyseClangTidy(const ImportProject::FileSettings &fileSettings)
16811705

16821706
if (!mSettings.buildDir.empty()) {
16831707
const std::string analyzerInfoFile = AnalyzerInformation::getAnalyzerInfoFile(mSettings.buildDir, fileSettings.filename, emptyString);
1684-
std::ofstream fcmd(analyzerInfoFile + ".clang-tidy-cmd");
1708+
1709+
std::ofstream fcmd;
1710+
fcmd.exceptions(std::ios_base::failbit | std::ios_base::badbit);
1711+
fcmd.open(analyzerInfoFile + ".clang-tidy-cmd");
16851712
fcmd << istr.str();
16861713
}
16871714

‎lib/summaries.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ std::string Summaries::create(const Tokenizer *tokenizer, const std::string &cfg
8686
const std::string::size_type pos = filename.rfind(".a");
8787
if (pos != std::string::npos) {
8888
filename[pos+1] = 's';
89-
std::ofstream fout(filename);
89+
std::ofstream fout;
90+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
91+
fout.open(filename);
9092
fout << ostr.str();
9193
}
9294
}

‎test/helpers.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ ScopedFile::ScopedFile(std::string name, const std::string &content, std::string
5454
#endif
5555
}
5656

57-
std::ofstream of(mFullPath);
58-
if (!of.is_open())
59-
throw std::runtime_error("ScopedFile(" + mFullPath + ") - could not open file");
57+
std::ofstream of;
58+
of.exceptions(std::ios_base::failbit | std::ios_base::badbit);
59+
of.open(mFullPath);
6060
of << content;
6161
}
6262

‎tools/dmake.cpp

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,10 @@ static int write_vcxproj(const std::string &proj_name, const std::function<void(
214214
outstr.resize(pos+1, '\0');
215215
}
216216

217+
std::ofstream out;
218+
out.exceptions(std::ios_base::failbit | std::ios_base::badbit);
217219
// treat as binary to prevent implicit line ending conversions
218-
std::ofstream out(proj_name, std::ios::binary|std::ios::trunc);
220+
out.open(proj_name, std::ios::binary|std::ios::trunc);
219221
out << outstr;
220222

221223
return EXIT_SUCCESS;
@@ -394,36 +396,33 @@ int main(int argc, char **argv)
394396

395397
// QMAKE - lib/lib.pri
396398
{
397-
std::ofstream fout1("lib/lib.pri");
398-
if (fout1.is_open()) {
399-
fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
400-
fout1 << "include($$PWD/pcrerules.pri)\n";
401-
fout1 << "include($$PWD/../externals/externals.pri)\n";
402-
fout1 << "INCLUDEPATH += $$PWD\n";
403-
fout1 << "HEADERS += ";
404-
for (const std::string &libfile_h : libfiles_h) {
405-
fout1 << "$${PWD}/" << libfile_h;
406-
if (libfile_h != libfiles_h.back())
407-
fout1 << " \\\n" << std::string(11, ' ');
408-
}
409-
fout1 << "\n\nSOURCES += ";
410-
for (const std::string &libfile : libfiles) {
411-
fout1 << "$${PWD}/" << libfile.substr(4);
412-
if (libfile != libfiles.back())
413-
fout1 << " \\\n" << std::string(11, ' ');
414-
}
415-
fout1 << "\n";
399+
std::ofstream fout1;
400+
fout1.exceptions(std::ios_base::failbit | std::ios_base::badbit);
401+
fout1.open("lib/lib.pri");
402+
403+
fout1 << "# no manual edits - this file is autogenerated by dmake\n\n";
404+
fout1 << "include($$PWD/pcrerules.pri)\n";
405+
fout1 << "include($$PWD/../externals/externals.pri)\n";
406+
fout1 << "INCLUDEPATH += $$PWD\n";
407+
fout1 << "HEADERS += ";
408+
for (const std::string &libfile_h : libfiles_h) {
409+
fout1 << "$${PWD}/" << libfile_h;
410+
if (libfile_h != libfiles_h.back())
411+
fout1 << " \\\n" << std::string(11, ' ');
412+
}
413+
fout1 << "\n\nSOURCES += ";
414+
for (const std::string &libfile : libfiles) {
415+
fout1 << "$${PWD}/" << libfile.substr(4);
416+
if (libfile != libfiles.back())
417+
fout1 << " \\\n" << std::string(11, ' ');
416418
}
419+
fout1 << "\n";
417420
}
418421

419422
static const char makefile[] = "Makefile";
420-
std::ofstream fout(makefile, std::ios_base::trunc);
421-
if (!fout.is_open()) {
422-
std::cerr << "An error occurred while trying to open "
423-
<< makefile
424-
<< ".\n";
425-
return EXIT_FAILURE;
426-
}
423+
std::ofstream fout;
424+
fout.exceptions(std::ios_base::failbit | std::ios_base::badbit);
425+
fout.open(makefile, std::ios_base::trunc);
427426

428427
fout << "# This file is generated by tools/dmake, do not edit.\n\n";
429428

0 commit comments

Comments
 (0)