Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 15 additions & 4 deletions src/ffi/data.cc
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ void ExportBytes(const FunctionCallbackInfo<Value>& args) {
args[0]->IsArrayBufferView()) {
view.ReadValue(args[0]);
if (view.WasDetached()) {
THROW_ERR_INVALID_ARG_VALUE(env, "Invalid ArrayBufferView backing store");
THROW_ERR_INVALID_ARG_VALUE(env, "ArrayBuffer is detached");
return;
}
} else {
Expand Down Expand Up @@ -749,15 +749,26 @@ void GetRawPointer(const FunctionCallbackInfo<Value>& args) {
std::shared_ptr<BackingStore> store;

if (args[0]->IsArrayBuffer()) {
store = args[0].As<ArrayBuffer>()->GetBackingStore();
Local<ArrayBuffer> buffer = args[0].As<ArrayBuffer>();
if (buffer->WasDetached()) {
THROW_ERR_INVALID_ARG_VALUE(env, "ArrayBuffer is detached");
return;
}
store = buffer->GetBackingStore();
} else if (args[0]->IsSharedArrayBuffer()) {
store = args[0].As<SharedArrayBuffer>()->GetBackingStore();
} else if (args[0]->IsArrayBufferView()) {
Local<ArrayBufferView> view = args[0].As<ArrayBufferView>();
if (view->Buffer()->WasDetached()) {
THROW_ERR_INVALID_ARG_VALUE(
env, "ArrayBufferView is backed by a detached ArrayBuffer");
return;
}
// Access the store here to ensure that it exists. Small typed arrays
// may not have a store until this point and can instead be stored
// entirely in-heap.
store = args[0].As<ArrayBufferView>()->Buffer()->GetBackingStore();
offset = args[0].As<ArrayBufferView>()->ByteOffset();
store = view->Buffer()->GetBackingStore();
offset = view->ByteOffset();
} else {
THROW_ERR_INVALID_ARG_TYPE(
env,
Expand Down
13 changes: 13 additions & 0 deletions src/ffi/types.cc
Original file line number Diff line number Diff line change
Expand Up @@ -700,6 +700,14 @@ Maybe<FFIArgumentCategory> ToFFIArgument(Environment* env,
// invalidating that backing store during the active FFI call is
// unsupported and dangerous.
Local<ArrayBufferView> view = arg.As<ArrayBufferView>();
if (view->Buffer()->WasDetached()) {
THROW_ERR_INVALID_ARG_VALUE(
env,
"Argument %u is an ArrayBufferView backed by a detached "
"ArrayBuffer",
index);
return {};
}
std::shared_ptr<BackingStore> store = view->Buffer()->GetBackingStore();

if (!store) {
Expand All @@ -721,6 +729,11 @@ Maybe<FFIArgumentCategory> ToFFIArgument(Environment* env,
// that backing store during the active FFI call is unsupported and
// dangerous.
Local<ArrayBuffer> buffer = arg.As<ArrayBuffer>();
if (buffer->WasDetached()) {
THROW_ERR_INVALID_ARG_VALUE(
env, "Argument %u is a detached ArrayBuffer", index);
return {};
}
std::shared_ptr<BackingStore> store = buffer->GetBackingStore();

if (!store) {
Expand Down
35 changes: 35 additions & 0 deletions test/ffi/test-ffi-memory.js
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,41 @@ test('ffi getRawPointer returns raw addresses for byte sources', () => {
assert.strictEqual(sharedViewPointer, sharedArrayBufferPointer + 2n);
});

test('ffi rejects detached array buffers and views as pointers', () => {
const arrayBuffer = new ArrayBuffer(8);
const typedArray = new Uint8Array(arrayBuffer);
const dataView = new DataView(arrayBuffer);

arrayBuffer.transfer();

assert.throws(() => ffi.exportArrayBuffer(arrayBuffer, 0n, 0), {
code: 'ERR_INVALID_ARG_VALUE',
message: 'ArrayBuffer is detached',
});

for (const [value, rawPointerMessage, argumentMessage] of [
[
arrayBuffer,
'ArrayBuffer is detached',
'Argument 0 is a detached ArrayBuffer',
],
...[typedArray, dataView].map((view) => [
view,
'ArrayBufferView is backed by a detached ArrayBuffer',
'Argument 0 is an ArrayBufferView backed by a detached ArrayBuffer',
]),
]) {
assert.throws(() => ffi.getRawPointer(value), {
code: 'ERR_INVALID_ARG_VALUE',
message: rawPointerMessage,
});
assert.throws(() => symbols.pointer_to_usize(value), {
code: 'ERR_INVALID_ARG_VALUE',
message: argumentMessage,
});
}
});

test('ffi exportString and exportBuffer copy data into native memory', () => {
withAllocations(common.mustCall((alloc) => {
const stringPtr = alloc(16);
Expand Down
Loading