Skip to content

[v11.x] src: allocate Buffer memory using ArrayBuffer allocator #26302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 6 commits into from
Closed

[v11.x] src: allocate Buffer memory using ArrayBuffer allocator #26302

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce5da3f
deps: V8: cherry-pick d3308d0
addaleax Feb 19, 2019
cf75949
src: make IsolateData store ArrayBufferAllocator
addaleax Feb 18, 2019
29ac9ef
worker: copy transferList ArrayBuffers on unknown allocator
addaleax Feb 19, 2019
86fdd46
src: add debugging array allocator
addaleax Feb 18, 2019
9627be8
src: add allocation utils to env
addaleax Feb 18, 2019
3a08a7a
src: allocate Buffer memory using ArrayBuffer allocator
addaleax Feb 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
worker: copy transferList ArrayBuffers on unknown allocator 
If the `ArrayBuffer::Allocator` used to create `ArrayBuffer`s
in the current `Isolate` is not a Node.js `ArrayBufferAllocator`,
we cannot know that it is `malloc()`-based, an in particular it might
not be compatible with the `ArrayBuffer::Allocator` on the receiving
end of the connection.

PR-URL: #26207
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
  • Loading branch information
@addaleax
addaleax committed Feb 28, 2019
commit 29ac9ef4e0aa7d937c453736e06a683a52c8fd9b
16 changes: 15 additions & 1 deletion src/node_messaging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ MaybeLocal<Value> Message::Deserialize(Environment* env,

// Attach all transferred ArrayBuffers to their new Isolate.
for (uint32_t i = 0; i < array_buffer_contents_.size(); ++i) {
if (!env->isolate_data()->uses_node_allocator()) {
// We don't use Node's allocator on the receiving side, so we have
// to create the ArrayBuffer from a copy of the memory.
AllocatedBuffer buf =
env->AllocateManaged(array_buffer_contents_[i].size);
memcpy(buf.data(),
array_buffer_contents_[i].data,
array_buffer_contents_[i].size);
deserializer.TransferArrayBuffer(i, buf.ToArrayBuffer());
continue;
}

Local<ArrayBuffer> ab =
ArrayBuffer::New(env->isolate(),
array_buffer_contents_[i].release(),
Expand Down Expand Up @@ -288,8 +300,10 @@ Maybe<bool> Message::Serialize(Environment* env,
Local<ArrayBuffer> ab = entry.As<ArrayBuffer>();
// If we cannot render the ArrayBuffer unusable in this Isolate and
// take ownership of its memory, copying the buffer will have to do.
if (!ab->IsNeuterable() || ab->IsExternal())
if (!ab->IsNeuterable() || ab->IsExternal() ||
!env->isolate_data()->uses_node_allocator()) {
continue;
}
if (std::find(array_buffers.begin(), array_buffers.end(), ab) !=
array_buffers.end()) {
ThrowDataCloneException(
Expand Down