minor fixes

nodejs · Feb 17, 2023 · 7b5fe63 · 7b5fe63
1 parent d9bd41f
commit 7b5fe63
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/lib/fs.js b/lib/fs.js
@@ -821,10 +821,8 @@ function write(fd, buffer, offsetOrOptions, length, position, callback) {
   fd = getValidatedFd(fd);
 
   let offset = offsetOrOptions;
-  if (isArrayBuffer(buffer)) {
-    buffer = new Uint8Array(buffer);
-  }
-  if (isArrayBufferView(buffer)) {
+  const bufferToWrite = isArrayBuffer(buffer) ? new Uint8Array(buffer) : buffer;
+  if (isArrayBufferView(bufferToWrite)) {
     callback = maybeCallback(callback || position || length || offset);
 
     if (typeof offset === 'object') {

diff --git a/lib/internal/fs/promises.js b/lib/internal/fs/promises.js
@@ -653,12 +653,12 @@ async function write(handle, buffer, offsetOrOptions, length, position) {
 }
 
 async function writev(handle, buffers, position) {
-  if (buffers.length === 0) {
+  const buffersToWrite = validateAndNormalizeBufferArray(buffers);
+
+  if (buffersToWrite.length === 0) {
     return { __proto__: null, bytesWritten: 0, buffers };
   }
 
-  const buffersToWrite = validateAndNormalizeBufferArray(buffers);
-
   if (typeof position !== 'number')
     position = null;
 

diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
@@ -731,7 +731,7 @@ const validateBufferArray = hideStackFrames((buffers, propName = 'buffers') => {
 
 const validateAndNormalizeBufferArray = hideStackFrames((buffers, propName = 'buffers') => {
   if (!ArrayIsArray(buffers))
-    throw new ERR_INVALID_ARG_TYPE(propName, 'ArrayBufferView[]', buffers);
+    throw new ERR_INVALID_ARG_TYPE(propName, ['ArrayBufferView[]', 'ArrayBuffer[]'], buffers);
 
   const output = [];
   for (let i = 0; i < buffers.length; i++) {
@@ -741,7 +741,7 @@ const validateAndNormalizeBufferArray = hideStackFrames((buffers, propName = 'bu
     } else if (isArrayBuffer(buffer)) {
       output.push(new Uint8Array(buffers[i]));
     } else {
-      throw new ERR_INVALID_ARG_TYPE(propName, 'ArrayBufferView[]', buffers);
+      throw new ERR_INVALID_ARG_TYPE(propName, ['ArrayBufferView[]', 'ArrayBuffer[]'], buffers);
     }
   }
   return output;
@@ -907,7 +907,7 @@ const validateStringAfterArrayBufferView = hideStackFrames((buffer, name) => {
   if (typeof buffer !== 'string') {
     throw new ERR_INVALID_ARG_TYPE(
       name,
-      ['string', 'Buffer', 'TypedArray', 'DataView'],
+      ['string', 'Buffer', 'TypedArray', 'DataView', 'ArrayBuffer'],
       buffer,
     );
   }