Node.js also supports Buffer creation from {buffer: ArrayBuffer}

diff --git a/index.js b/index.js
index 0ee40c10cbe63a3002e657cbe711a3ded551e7c7..bc48eccadc54847b15a4f6aec04b9c2149305d94 100644 (file)
--- a/index.js
+++ b/index.js
@@ -104,7 +104,7 @@ function from (value, encodingOrOffset, length) {
     throw new TypeError('"value" argument must not be a number')
   }
 
-  if (isArrayBuffer(value)) {
+  if (isArrayBuffer(value) || (value && isArrayBuffer(value.buffer))) {
     return fromArrayBuffer(value, encodingOrOffset, length)
   }
 

diff --git a/test/node/test-buffer-alloc.js b/test/node/test-buffer-alloc.js
index 8b3e52b2a9592e62f9e99f0a7594136e120dbc39..f8137bdb99f5da6bf6f6966208938874d96fd7e9 100644 (file)
--- a/test/node/test-buffer-alloc.js
+++ b/test/node/test-buffer-alloc.js
@@ -999,9 +999,8 @@ assert.doesNotThrow(() => Buffer.from(new ArrayBuffer()));
 // Test that ArrayBuffer from a different context is detected correctly
 var arrayBuf = vm.runInNewContext('new ArrayBuffer()');
 assert.doesNotThrow(() => Buffer.from(arrayBuf));
-/*
 assert.doesNotThrow(() => Buffer.from({ buffer: arrayBuf }));
-
+/*
 assert.throws(() => Buffer.alloc({ valueOf: () => 1 }),
               /"size" argument must be of type number/);
 assert.throws(() => Buffer.alloc({ valueOf: () => -1 }),