Skip to content

src: refactor and harden ProcessEmitWarning() #17420

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

Closed
addaleax wants to merge 6 commits into from
Closed

src: refactor and harden ProcessEmitWarning() #17420

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2bb2ed1
src: refactor and harden `ProcessEmitWarning()`
addaleax Dec 1, 2017
657555d
[squash] indentation
addaleax Dec 1, 2017
bb5ba30
[squash] bnoordhuis & AndreasMadsen nits
addaleax Dec 2, 2017
1c72f29
[squash] bnoordhuis comment
addaleax Dec 9, 2017
35d3c42
[squash] skip test in FIPS mode
addaleax Dec 10, 2017
a9613ac
[squash] skip environment variable encoding test on windows
addaleax Dec 10, 2017
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
Prev Previous commit
Next Next commit
[squash] bnoordhuis comment
  • Loading branch information
@addaleax
addaleax committed Dec 10, 2017
commit 1c72f298c0485c3d515bb1d0f13d056ec0ecf53b
15 changes: 8 additions & 7 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,13 +1062,14 @@ void SecureContext::AddRootCerts(const FunctionCallbackInfo<Value>& args) {
root_cert_store,
extra_root_certs_file.c_str());
if (err) {
if (ProcessEmitWarning(sc->env(),
"Ignoring extra certs from `%s`, "
"load failed: %s\n",
extra_root_certs_file.c_str(),
ERR_error_string(err, nullptr)).IsNothing()) {
return;
}
// We do not call back into JS after this line anyway, so ignoring
// the return value of ProcessEmitWarning does not affect how a
// possible exception would be propagated.
ProcessEmitWarning(sc->env(),
"Ignoring extra certs from `%s`, "
"load failed: %s\n",
extra_root_certs_file.c_str(),
ERR_error_string(err, nullptr));
}
}
}
Expand Down