nodejs
diff --git a/‎lib/ffi.js‎
Lines changed: 12 additions & 1 deletion b/‎lib/ffi.js‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎src/util-inl.h‎
Lines changed: 1 addition & 0 deletions b/‎src/util-inl.h‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎test/ffi/test-ffi-memory.js‎
Lines changed: 17 additions & 0 deletions b/‎test/ffi/test-ffi-memory.js‎
Lines changed: 17 additions & 0 deletions
@@ -1,6 +1,8 @@
 'use strict';
 
 const {
+  ArrayBufferPrototypeGetDetached,
+  DataViewPrototypeGetBuffer,
   FunctionPrototypeCall,
   ObjectDefineProperty,
   ObjectFreeze,
@@ -10,11 +12,14 @@ const {
   SafeWeakMap,
   SafeWeakRef,
   SymbolDispose,
+  TypedArrayPrototypeGetBuffer,
 } = primordials;
 const { Buffer } = require('buffer');
 const { emitExperimentalWarning } = require('internal/util');
 const {
+  isDataView,
   isArrayBufferView,
+  isSharedArrayBuffer,
 } = require('internal/util/types');
 const {
   codes: {
@@ -299,7 +304,13 @@ function exportArrayBufferView(source, data, len) {
 
   validateInteger(len, 'len', 0);
 
-  if (len < source.byteLength) {
+  // Reading byteLength throws for a detached DataView. Let the native binding
+  // reject detached views consistently with detached ArrayBuffers.
+  const buffer = isDataView(source) ?
+    DataViewPrototypeGetBuffer(source) : TypedArrayPrototypeGetBuffer(source);
+  if ((isSharedArrayBuffer(buffer) ||
+       !ArrayBufferPrototypeGetDetached(buffer)) &&
+      len < source.byteLength) {
     throw new ERR_OUT_OF_RANGE('len', `>= ${source.byteLength}`, len);
   }
 
 
@@ -572,6 +572,7 @@ ArrayBufferViewContents<T, S>::ArrayBufferViewContents(
 template <typename T, size_t S>
   requires(sizeof(T) == 1)
 void ArrayBufferViewContents<T, S>::Read(v8::Local<v8::ArrayBufferView> abv) {
+  was_detached_ = abv->Buffer()->WasDetached();
   length_ = abv->ByteLength();
   if (length_ > sizeof(stack_storage_) || abv->HasBuffer()) {
     auto buf_data = abv->Buffer()->Data();
 
@@ -286,6 +286,23 @@ test('ffi validates memory access arguments', () => {
     assert.throws(() => ffi.exportArrayBufferView('bad', ptr, 4), { code: 'ERR_INVALID_ARG_TYPE' });
     assert.throws(() => ffi.exportArrayBufferView(new Uint8Array([1]), ptr, -1), { code: 'ERR_OUT_OF_RANGE' });
     assert.throws(() => ffi.exportArrayBufferView(new Uint8Array([1, 2]), ptr, 1), { code: 'ERR_OUT_OF_RANGE' });
+    ffi.exportArrayBufferView(new Uint8Array(new SharedArrayBuffer(1)), ptr, 1);
+
+    const detachedArrayBuffer = new ArrayBuffer(1);
+    detachedArrayBuffer.transfer();
+    assert.throws(() => ffi.exportArrayBuffer(detachedArrayBuffer, ptr, 1), {
+      code: 'ERR_INVALID_ARG_VALUE',
+    });
+
+    for (const View of [Uint8Array, DataView]) {
+      const arrayBuffer = new ArrayBuffer(1);
+      const view = new View(arrayBuffer);
+      arrayBuffer.transfer();
+      assert.throws(() => ffi.exportArrayBufferView(view, ptr, 1), {
+        code: 'ERR_INVALID_ARG_VALUE',
+      });
+    }
+
     assert.throws(() => ffi.toBuffer(maxPointer, 8), /pointer and length exceed the platform address range/);
     assert.throws(() => ffi.toArrayBuffer(maxPointer, 8), /pointer and length exceed the platform address range/);
     assert.throws(() => ffi.toBuffer(1n, bufferConstants.MAX_LENGTH + 1), { code: 'ERR_BUFFER_TOO_LARGE' });