src: make workers messaging more resilient

nodejs · May 3, 2021 · a73a147 · a73a147
1 parent 051741c
commit a73a147
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/node_messaging.cc b/src/node_messaging.cc
@@ -1066,7 +1066,7 @@ void MessagePort::MoveToContext(const FunctionCallbackInfo<Value>& args) {
   }
   MessagePort* port = Unwrap<MessagePort>(args[0].As<Object>());
   if (port == nullptr || port->IsHandleClosing()) {
-    Isolate* isolate = env->isolate();
+    Isolate* isozlate = env->isolate();
     THROW_ERR_CLOSED_MESSAGE_PORT(isolate);
     return;
   }

diff --git a/test/parallel/test-worker-message-port-close.js b/test/parallel/test-worker-message-port-close.js
@@ -1,6 +1,7 @@
 'use strict';
 const common = require('../common');
-const { MessageChannel } = require('worker_threads');
+const assert = require('assert');
+const { MessageChannel, moveMessagePortToContext } = require('worker_threads');
 
 // Make sure that .start() and .stop() do not throw on closing/closed
 // MessagePorts.
@@ -29,3 +30,12 @@ function dummy() {}
     port1.off('message', dummy);
   }));
 }
+
+{
+  const { port2 } = new MessageChannel();
+  port2.close();
+  assert.throws(() => moveMessagePortToContext(port2, {}), {
+    code: 'ERR_CLOSED_MESSAGE_PORT',
+    message: 'Cannot send data on closed MessagePort'
+  });
+}