Skip to content

src: fix a series of -Wno-unreachable-code errors #58901

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
wants to merge 4 commits into from
+6 −8
Closed

src: fix a series of -Wno-unreachable-code errors #58901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c931944
src: fix -Wunreachable-code in src/node_api.cc
codebytere Jun 30, 2025
8a3c0b2
src: fix -Wunreachable-code-return in src/node_contextify.cc
codebytere Jun 30, 2025
22f7cc9
src: -Wunreachable-code error in crypto_context.cc
codebytere Jun 30, 2025
c6a8fa3
src: -Wunreachable-code-break in node_config_file.cc
codebytere Jun 30, 2025
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
8 changes: 4 additions & 4 deletions src/crypto/crypto_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ static const char* const root_certs[] = {
#include "node_root_certs.h" // NOLINT(build/include_order)
};

static const char system_cert_path[] = NODE_OPENSSL_SYSTEM_CERT_PATH;

static std::string extra_root_certs_file; // NOLINT(runtime/string)

static std::atomic<bool> has_cached_bundled_root_certs{false};
Expand Down Expand Up @@ -838,11 +836,13 @@ X509_STORE* NewRootCertStore() {
X509_STORE* store = X509_STORE_new();
CHECK_NOT_NULL(store);

if (*system_cert_path != '\0') {
#ifdef NODE_OPENSSL_SYSTEM_CERT_PATH
if constexpr (sizeof(NODE_OPENSSL_SYSTEM_CERT_PATH) > 1) {
ERR_set_mark();
X509_STORE_load_locations(store, system_cert_path, nullptr);
X509_STORE_load_locations(store, NODE_OPENSSL_SYSTEM_CERT_PATH, nullptr);
ERR_pop_to_mark();
}
#endif

Mutex::ScopedLock cli_lock(node::per_process::cli_options_mutex);
if (per_process::cli_options->ssl_openssl_cert_store) {
Expand Down
4 changes: 2 additions & 2 deletions src/node_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,8 +1058,7 @@ napi_create_external_buffer(napi_env env,

#ifdef V8_ENABLE_SANDBOX
return napi_set_last_error(env, napi_no_external_buffers_allowed);
#endif // V8_ENABLE_SANDBOX

#else
v8::Isolate* isolate = env->isolate;

// The finalizer object will delete itself after invoking the callback.
Expand All @@ -1081,6 +1080,7 @@ napi_create_external_buffer(napi_env env,
// as it will be deleted when the buffer to which it is associated
// is finalized.
// coverity[leaked_storage]
#endif // V8_ENABLE_SANDBOX
}

napi_status NAPI_CDECL napi_create_buffer_copy(napi_env env,
Expand Down
1 change: 0 additions & 1 deletion src/node_config_file.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ ParseResult ConfigReader::ProcessOptionValue(
"No-op flag %s is currently not supported\n",
option_name.c_str());
return ParseResult::InvalidContent;
break;
}
case options_parser::OptionType::kV8Option: {
FPrintF(stderr,
Expand Down
1 change: 0 additions & 1 deletion src/node_contextify.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,6 @@ Intercepted ContextifyContext::PropertyDefinerCallback(
// kYes to behave according to the expected semantics.
return Intercepted::kNo;
}
return Intercepted::kNo;
}

// static
Expand Down
Loading