Skip to content

Commit 143379d

Browse files
codebytereRafaelGSS
authored andcommitted
src: -Wunreachable-code error in crypto_context.cc
PR-URL: #58901 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Vladimir Morozov <vmorozov@microsoft.com>
1 parent 056a1af commit 143379d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/crypto/crypto_context.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ static const char* const root_certs[] = {
7777
#include "node_root_certs.h" // NOLINT(build/include_order)
7878
};
7979

80-
static const char system_cert_path[] = NODE_OPENSSL_SYSTEM_CERT_PATH;
81-
8280
static std::string extra_root_certs_file; // NOLINT(runtime/string)
8381

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

841-
if (*system_cert_path != '\0') {
839+
#ifdef NODE_OPENSSL_SYSTEM_CERT_PATH
840+
if constexpr (sizeof(NODE_OPENSSL_SYSTEM_CERT_PATH) > 1) {
842841
ERR_set_mark();
843-
X509_STORE_load_locations(store, system_cert_path, nullptr);
842+
X509_STORE_load_locations(store, NODE_OPENSSL_SYSTEM_CERT_PATH, nullptr);
844843
ERR_pop_to_mark();
845844
}
845+
#endif
846846

847847
Mutex::ScopedLock cli_lock(node::per_process::cli_options_mutex);
848848
if (per_process::cli_options->ssl_openssl_cert_store) {

0 commit comments

Comments
 (0)