crypto: add check for funciton call fail scenario, add test case for …

…the fix
nodejs · Sep 30, 2020 · e8edcb5 · e8edcb5
1 parent e138130
commit e8edcb5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -3467,7 +3467,9 @@ BaseObjectPtr<BaseObject> NativeKeyObject::KeyObjectTransferData::Deserialize(
   Local<Function> key_ctor;
   Local<Value> arg = FIXED_ONE_BYTE_STRING(env->isolate(),
                                               "internal/crypto/keys");
-  env->native_module_require()->Call(context, Null(env->isolate()), 1, &arg);
+  if (env->native_module_require()->
+      Call(context, Null(env->isolate()), 1, &arg).IsEmpty())
+    return {};
   switch (data_->GetKeyType()) {
     case kKeyTypeSecret:
       key_ctor = env->crypto_key_object_secret_constructor();

diff --git a/test/parallel/test-crypto-worker-thread.js b/test/parallel/test-crypto-worker-thread.js
@@ -0,0 +1,18 @@
+'use strict';
+const common = require('../common');
+if (!common.hasCrypto)
+  common.skip('missing crypto');
+
+// Issue https://github.com/nodejs/node/issues/35263
+/* Description: test for checking keyobject passed to worker thread
+ does not crash */
+const { createSecretKey } = require('crypto');
+
+const { Worker, isMainThread, workerData } = require('worker_threads');
+
+if (isMainThread) {
+  const key = createSecretKey(Buffer.from('hello'));
+  new Worker(__filename, { workerData: key });
+} else {
+  console.log(workerData);
+}