worker: fix nested uncaught exception handling

We are using `ObjectPrototypeToString()` as a cross-context brand check for built-in errors, but weren’t making sure to set that when deserializing errors back into JS objects. Fix that by setting `[Symbol.toStringTag]` manually, to make sure that multiple serialize-and-deserialize cycles keep giving the same result. Fixes: #34309 PR-URL: #34310 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Yongsheng Zhang <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: James M Snell <[email protected]>
nodejs · Jul 16, 2020 · 1bc4def · 1bc4def
1 parent 060c95a
commit 1bc4def
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/lib/internal/error_serdes.js b/lib/internal/error_serdes.js
@@ -14,6 +14,7 @@ const {
   ObjectKeys,
   ObjectPrototypeToString,
   SafeSet,
+  SymbolToStringTag,
 } = primordials;
 
 const kSerializedError = 0;
@@ -116,6 +117,10 @@ function deserializeError(error) {
     case kSerializedError:
       const { constructor, properties } = deserialize(error.subarray(1));
       const ctor = errors[constructor];
+      ObjectDefineProperty(properties, SymbolToStringTag, {
+        value: { value: 'Error', configurable: true },
+        enumerable: true
+      });
       return ObjectCreate(ctor.prototype, properties);
     case kSerializedObject:
       return deserialize(error.subarray(1));

diff --git a/test/parallel/test-error-serdes.js b/test/parallel/test-error-serdes.js
@@ -16,12 +16,17 @@ assert.strictEqual(cycle(null), null);
 assert.strictEqual(cycle(undefined), undefined);
 assert.strictEqual(cycle('foo'), 'foo');
 
-{
-  const err = cycle(new Error('foo'));
+let err = new Error('foo');
+for (let i = 0; i < 10; i++) {
   assert(err instanceof Error);
+  assert(Object.prototype.toString.call(err), '[object Error]');
   assert.strictEqual(err.name, 'Error');
   assert.strictEqual(err.message, 'foo');
   assert(/^Error: foo\n/.test(err.stack));
+
+  const prev = err;
+  err = cycle(err);
+  assert.deepStrictEqual(err, prev);
 }
 
 assert.strictEqual(cycle(new RangeError('foo')).name, 'RangeError');

diff --git a/test/parallel/test-worker-nested-uncaught.js b/test/parallel/test-worker-nested-uncaught.js
@@ -0,0 +1,14 @@
+'use strict';
+const common = require('../common');
+const { Worker } = require('worker_threads');
+
+// Regression test for https://github.com/nodejs/node/issues/34309
+
+const w = new Worker(
+  `const { Worker } = require('worker_threads');
+  new Worker("throw new Error('uncaught')", { eval:true })`,
+  { eval: true });
+w.on('error', common.expectsError({
+  name: 'Error',
+  message: 'uncaught'
+}));