bthreads: throw DataCloneError on duplicate transfer objects. see nod…

…ejs/node#25786.
chjj · Jan 29, 2019 · 7bf32b7 · 7bf32b7
1 parent abff778
commit 7bf32b7
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/lib/internal/clone.js b/lib/internal/clone.js
@@ -15,7 +15,13 @@
 
 'use strict';
 
-const {cloneError} = require('./utils');
+const utils = require('./utils');
+
+const {
+ cloneError,
+ duplicateError,
+ hasDuplicates
+} = utils;
 
 /*
  * Constants
@@ -126,6 +132,9 @@ class Cloner {
  }
 
  morph(value, transferList, opt) {
+ if (hasDuplicates(transferList))
+ throw duplicateError();
+
  if (!this.hasPort(transferList, opt))
  return [value, transferList, false];
 
@@ -436,7 +445,12 @@ class FullCloner extends Cloner {
  if (!this.isTransferList(transferList))
  throw new TypeError('Invalid transferList.');
 
- return this._walk(value, new Set(transferList));
+ const list = new Set(transferList);
+
+ if (list.size !== transferList.length)
+ throw duplicateError();
+
+ return this._walk(value, list);
  }
 }
 

diff --git a/lib/internal/utils.js b/lib/internal/utils.js
@@ -31,6 +31,26 @@ function cloneError(obj) {
  return err;
 }
 
+function duplicateError() {
+ const err = new Error('Duplicate items present in transferList.');
+
+ err.name = 'DataCloneError';
+
+ if (Error.captureStackTrace)
+ Error.captureStackTrace(err, duplicateError);
+
+ return err;
+}
+
+function hasDuplicates(list) {
+ if (!Array.isArray(list))
+ return false;
+
+ const set = new Set(list);
+
+ return set.size !== list.length;
+}
+
 function toBuffer(value) {
  if (value instanceof Uint8Array)
  return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
@@ -71,6 +91,8 @@ function setupRefs(ref, ee, event) {
 
 exports.objectString = objectString;
 exports.cloneError = cloneError;
+exports.duplicateError = duplicateError;
+exports.hasDuplicates = hasDuplicates;
 exports.toBuffer = toBuffer;
 exports.once = once;
 exports.setupRefs = setupRefs;
diff --git a/lib/process/common.js b/lib/process/common.js
@@ -12,8 +12,10 @@
 
 const util = require('util');
 const {EventEmitter} = require('events');
+const utils = require('../internal/utils');
 const clone = require('../internal/clone');
 const Packet = require('./packet');
+const {duplicateError, hasDuplicates} = utils;
 const {types} = Packet;
 
 /*
@@ -240,6 +242,9 @@ function activate(transferList, parent) {
  if (!Array.isArray(transferList))
  throw new TypeError('Invalid transferList.');
 
+ if (hasDuplicates(transferList))
+ throw duplicateError();
+
  for (const item of transferList) {
  if (item instanceof MessagePort) {
  let channel = item._channel;