src,crypto: handle empty maybe correctly in crypto_dh.cc

Buffer::Length() dereferences the passed Local, so calling it when the underlying pointer is a nullptr would lead to a crash. This fixes that by returning early instead. Signed-off-by: Darshan Sen <[email protected]> PR-URL: #42492 Refs: #39941 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
nodejs · Apr 6, 2022 · 970483f · 970483f
1 parent 0c54f36
commit 970483f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/crypto/crypto_dh.cc b/src/crypto/crypto_dh.cc
@@ -32,7 +32,6 @@ using v8::ReadOnly;
 using v8::SideEffectType;
 using v8::Signature;
 using v8::String;
-using v8::Uint8Array;
 using v8::Value;
 
 namespace crypto {
@@ -637,8 +636,10 @@ void DiffieHellman::Stateless(const FunctionCallbackInfo<Value>& args) {
   ManagedEVPPKey our_key = our_key_object->Data()->GetAsymmetricKey();
   ManagedEVPPKey their_key = their_key_object->Data()->GetAsymmetricKey();
 
-  Local<Value> out = StatelessDiffieHellmanThreadsafe(our_key, their_key)
-      .ToBuffer(env).FromMaybe(Local<Uint8Array>());
+  Local<Value> out;
+  if (!StatelessDiffieHellmanThreadsafe(our_key, their_key)
+          .ToBuffer(env)
+              .ToLocal(&out)) return;
 
   if (Buffer::Length(out) == 0)
     return ThrowCryptoError(env, ERR_get_error(), "diffieHellman failed");