Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Avoid dereferencing &the_null_logger during initialization #152

Merged
smashwilson merged 6 commits into from
May 30, 2018
Merged

Avoid dereferencing &the_null_logger during initialization #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76e879c
Avoid dereferencing &the_null_logger during initialization
smashwilson Apr 20, 2018
85de3c5
Shhhh, linter
smashwilson May 30, 2018
49a98e5
Merge remote-tracking branch 'origin/master' into aw/deref
smashwilson May 30, 2018
2d98d68
Change nan dependency to ^
smashwilson May 30, 2018
0e49674
Regenerate lockfile
smashwilson May 30, 2018
c2daf76
:shirt:
smashwilson May 30, 2018
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
149 changes: 86 additions & 63 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"dependencies": {
"event-kit": "^2.4.0",
"fs-extra": "^6.0.0",
"nan": "2.10.0",
"nan": "^2.10.0",
"node-pre-gyp": "^0.10.0"
},
"binary": {
Expand Down
12 changes: 6 additions & 6 deletions src/log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ Logger *Logger::current()

string replace_logger(const Logger *new_logger)
{
string r = new_logger->get_error();
if (!r.empty()) {
if (new_logger != &the_null_logger) {
if (new_logger != &the_null_logger) {
string r = new_logger->get_error();
if (!r.empty()) {
delete new_logger;
}
return r;
Expand All @@ -167,17 +167,17 @@ string replace_logger(const Logger *new_logger)

string Logger::to_file(const char *filename)
{
return replace_logger(new FileLogger(filename));
return replace_logger(new FileLogger(filename)); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
}

string Logger::to_stderr()
{
return replace_logger(new StderrLogger());
return replace_logger(new StderrLogger()); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
}

string Logger::to_stdout()
{
return replace_logger(new StdoutLogger());
return replace_logger(new StdoutLogger()); // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks)
}

string Logger::disable()
Expand Down