nodejs
diff --git a/‎lib/internal/ffi/fast-api.js‎
Lines changed: 2 additions & 3 deletions b/‎lib/internal/ffi/fast-api.js‎
Lines changed: 2 additions & 3 deletions
diff --git a/‎test/ffi/test-ffi-fast-buffer.js‎
Lines changed: 33 additions & 0 deletions b/‎test/ffi/test-ffi-fast-buffer.js‎
Lines changed: 33 additions & 0 deletions
@@ -169,9 +169,8 @@ function convertPointerArg(type, value, stringState, index) {
   if (hasPointerMemoryArg(type, value)) {
     return getRawPointer(value);
   }
-  if (needsRawPointerConversion(type)) {
-    return getRawPointer(value);
-  }
+  // Pointer-like values (e.g. BigInt addresses) are passed through, matching
+  // ToFFIArgument in src/ffi/types.cc and the single-argument fast path.
   return value;
 }
 
 
@@ -133,3 +133,36 @@ test('optimized buffer signatures preserve pointer-like conversions', () => {
     lib.close();
   }
 });
+
+test('multi-argument buffer signatures accept pointer BigInts', () => {
+  const { lib, functions } = ffi.dlopen(libraryPath, {
+    sum_buffer: { arguments: ['buffer', 'u64'], return: 'u64' },
+    fill_buffer: { arguments: ['arraybuffer', 'u64', 'u32'], return: 'void' },
+  });
+
+  try {
+    const bytes = Buffer.from([1, 2, 3, 4]);
+    const pointer = ffi.getRawPointer(bytes);
+    const length = BigInt(bytes.length);
+
+    // The two-argument wrapper must treat a raw address like the buffer it
+    // came from, matching both the single-argument fast path and the slow
+    // paths in src/ffi/types.cc.
+    assert.strictEqual(functions.sum_buffer(pointer, length), 10n);
+    assert.strictEqual(functions.sum_buffer(bytes, length), 10n);
+    assert.strictEqual(functions.sum_buffer(0n, length), 0n);
+    assert.strictEqual(functions.sum_buffer(null, length), 0n);
+
+    // The three-argument wrapper must forward the address to real memory
+    // instead of rejecting it.
+    functions.fill_buffer(pointer, length, 7);
+    assert.deepStrictEqual(bytes, Buffer.from([7, 7, 7, 7]));
+
+    // Still accepted once the call has been optimized.
+    for (let i = 0; i < 100_000; i++) {
+      assert.strictEqual(functions.sum_buffer(pointer, length), 28n);
+    }
+  } finally {
+    lib.close();
+  }
+});
Original file line number	Diff line number	Diff line change
`@@ -169,9 +169,8 @@ function convertPointerArg(type, value, stringState, index) {`
`169`	`169`	`if (hasPointerMemoryArg(type, value)) {`
`170`	`170`	`return getRawPointer(value);`
`171`	`171`	`}`
`172`		`- if (needsRawPointerConversion(type)) {`
`173`		`- return getRawPointer(value);`
`174`		`- }`
	`172`	`+ // Pointer-like values (e.g. BigInt addresses) are passed through, matching`
	`173`	`+ // ToFFIArgument in src/ffi/types.cc and the single-argument fast path.`
`175`	`174`	`return value;`
`176`	`175`	`}`
`177`	`176`