nodejs
diff --git a/‎src/node_worker.cc‎
Lines changed: 2 additions & 2 deletions b/‎src/node_worker.cc‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎test/parallel/test-worker-unref-from-message-during-exit.js‎
Lines changed: 16 additions & 0 deletions b/‎test/parallel/test-worker-unref-from-message-during-exit.js‎
Lines changed: 16 additions & 0 deletions
@@ -665,7 +665,7 @@ void Worker::StopThread(const FunctionCallbackInfo<Value>& args) {
 void Worker::Ref(const FunctionCallbackInfo<Value>& args) {
   Worker* w;
   ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
-  if (!w->has_ref_) {
+  if (!w->has_ref_ && !w->thread_joined_) {
     w->has_ref_ = true;
     w->env()->add_refs(1);
   }
@@ -674,7 +674,7 @@ void Worker::Ref(const FunctionCallbackInfo<Value>& args) {
 void Worker::Unref(const FunctionCallbackInfo<Value>& args) {
   Worker* w;
   ASSIGN_OR_RETURN_UNWRAP(&w, args.This());
-  if (w->has_ref_) {
+  if (w->has_ref_ && !w->thread_joined_) {
     w->has_ref_ = false;
     w->env()->add_refs(-1);
   }
 
@@ -0,0 +1,16 @@
+'use strict';
+const common = require('../common');
+const { Worker } = require('worker_threads');
+
+// This used to crash because the `.unref()` was unexpected while the Worker
+// was exiting.
+
+const w = new Worker(`
+require('worker_threads').parentPort.postMessage({});
+`, { eval: true });
+w.on('message', common.mustCall(() => {
+  w.unref();
+}));
+
+// Wait a bit so that the 'message' event is emitted while the Worker exits.
+Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 100);