src: avoid possible race during NodeBIO initialization

PR-URL: #21984 Reviewed-By: Anatoli Papirovski <apapirovski@mac.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Jul 26, 2018 · b2ac7a750f9d3ec91a5fe30f47da5aa4d6978c51 · b2ac7a7
1 parent d85b0a3
commit b2ac7a750f9d3ec91a5fe30f47da5aa4d6978c51
Unified Split

Showing with 8 additions and 0 deletions.

+2 −0 src/node_crypto.cc

+2 −0 src/node_crypto.h

+2 −0 src/node_crypto_bio.cc

+2 −0 src/node_crypto_bio.h
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -5126,6 +5126,8 @@ void InitCryptoOnce() {
  ERR_load_ENGINE_strings();
  ENGINE_load_builtin_engines();
 #endif  // !OPENSSL_NO_ENGINE
+  
+
+  
+  NodeBIO::GetMethod();
 }

diff --git a/src/node_crypto.h b/src/node_crypto.h
@@ -97,6 +97,8 @@ extern int VerifyCallback(int preverify_ok, X509_STORE_CTX* ctx);
 extern void UseExtraCaCerts(const std::string& file);
+  
+void InitCryptoOnce();
+  
+
 class SecureContext : public BaseObject {
 public:
  ~SecureContext() override {

diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc
@@ -247,6 +247,8 @@ const BIO_METHOD* NodeBIO::GetMethod() {
  return &method;
 #else
+  
+  // This is called from InitCryptoOnce() to avoid race conditions during
+  
+  // initialization.
  static BIO_METHOD* method = nullptr;
  if (method == nullptr) {

diff --git a/src/node_crypto_bio.h b/src/node_crypto_bio.h
@@ -164,6 +164,8 @@ class NodeBIO : public MemoryRetainer {
  int eof_return_ = -1;
  Buffer* read_head_ = nullptr;
  Buffer* write_head_ = nullptr;
+  
+
+  
+  friend void node::crypto::InitCryptoOnce();
 };
 }  // namespace crypto