Skip to content
Permalink
Browse files

worker: throw for duplicates in transfer list

Throw a `DataCloneError` exception when encountering duplicate
`ArrayBuffer`s or `MessagePort`s in the transfer list.

Fixes: #25786

PR-URL: #25815
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information...
addaleax committed Jan 30, 2019
1 parent d683da7 commit 55c270253b1ae81a4493a05e7c68b272e42f21e5
Showing with 48 additions and 0 deletions.
  1. +19 −0 src/node_messaging.cc
  2. +29 −0 test/parallel/test-worker-message-port-transfer-duplicate.js
@@ -289,6 +289,15 @@ Maybe<bool> Message::Serialize(Environment* env,
// take ownership of its memory, copying the buffer will have to do.
if (!ab->IsNeuterable() || ab->IsExternal())
continue;
if (std::find(array_buffers.begin(), array_buffers.end(), ab) !=
array_buffers.end()) {
ThrowDataCloneException(
env,
FIXED_ONE_BYTE_STRING(
env->isolate(),
"Transfer list contains duplicate ArrayBuffer"));
return Nothing<bool>();
}
// We simply use the array index in the `array_buffers` list as the
// ID that we write into the serialized buffer.
uint32_t id = array_buffers.size();
@@ -314,6 +323,15 @@ Maybe<bool> Message::Serialize(Environment* env,
"MessagePort in transfer list is already detached"));
return Nothing<bool>();
}
if (std::find(delegate.ports_.begin(), delegate.ports_.end(), port) !=
delegate.ports_.end()) {
ThrowDataCloneException(
env,
FIXED_ONE_BYTE_STRING(
env->isolate(),
"Transfer list contains duplicate MessagePort"));
return Nothing<bool>();
}
delegate.ports_.push_back(port);
continue;
}
@@ -601,6 +619,7 @@ void MessagePort::OnClose() {
}

std::unique_ptr<MessagePortData> MessagePort::Detach() {
CHECK(data_);
Mutex::ScopedLock lock(data_->mutex_);
data_->owner_ = nullptr;
return std::move(data_);
@@ -0,0 +1,29 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const { MessageChannel } = require('worker_threads');

// Test that passing duplicate transferrables in the transfer list throws
// DataCloneError exceptions.

{
const { port1, port2 } = new MessageChannel();
port2.once('message', common.mustNotCall());

const port3 = new MessageChannel().port1;
assert.throws(() => {
port1.postMessage(port3, [port3, port3]);
}, /^DataCloneError: Transfer list contains duplicate MessagePort$/);
port1.close();
}

{
const { port1, port2 } = new MessageChannel();
port2.once('message', common.mustNotCall());

const buf = new Uint8Array(10);
assert.throws(() => {
port1.postMessage(buf, [buf.buffer, buf.buffer]);
}, /^DataCloneError: Transfer list contains duplicate ArrayBuffer$/);
port1.close();
}

0 comments on commit 55c2702

Please sign in to comment.
You can’t perform that action at this time.