stream: fix isDetachedBuffer validations in ReadableStream

lib/internal/webstreams/readablestream.js

@@ -101,6 +101,7 @@ const {
   extractHighWaterMark,
   extractSizeAlgorithm,
   lazyTransfer,
+  isDetachedBuffer,
   isViewedArrayBufferDetached,
   isBrandCheck,
   resetQueue,
@@ -658,11 +659,13 @@ class ReadableStreamBYOBRequest {
     const viewBuffer = ArrayBufferViewGetBuffer(view);
     const viewBufferByteLength = ArrayBufferGetByteLength(viewBuffer);
 
-    if (viewByteLength === 0 || viewBufferByteLength === 0) {
-      throw new ERR_INVALID_STATE.TypeError(
-        'View ArrayBuffer is zero-length or detached');
+    if (isDetachedBuffer(viewBuffer)) {
+      throw new ERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached');
     }
 
+    assert(viewByteLength > 0);
+    assert(viewBufferByteLength > 0);
+
     readableByteStreamControllerRespond(controller, bytesWritten);
   }
 
@@ -894,15 +897,19 @@ class ReadableStreamBYOBReader {
           ],
           view));
     }
+
     const viewByteLength = ArrayBufferViewGetByteLength(view);
     const viewBuffer = ArrayBufferViewGetBuffer(view);
     const viewBufferByteLength = ArrayBufferGetByteLength(viewBuffer);
 
     if (viewByteLength === 0 || viewBufferByteLength === 0) {
       return PromiseReject(
         new ERR_INVALID_STATE.TypeError(
-          'View ArrayBuffer is zero-length or detached'));
+          'View or Viewed ArrayBuffer is zero-length',
+        ),
+      );
     }
+
     // Supposed to assert here that the view's buffer is not
     // detached, but there's no API available to use to check that.
     if (this[kState].stream === undefined) {
@@ -2298,11 +2305,10 @@ function readableByteStreamControllerEnqueue(
   if (pendingPullIntos.length) {
     const firstPendingPullInto = pendingPullIntos[0];
 
-    const pendingBufferByteLength =
-      ArrayBufferGetByteLength(firstPendingPullInto.buffer);
-    if (pendingBufferByteLength === 0) {
+    if (isDetachedBuffer(firstPendingPullInto.buffer)) {
       throw new ERR_INVALID_STATE.TypeError(
-        'Destination ArrayBuffer is zero-length or detached');
+        'Destination ArrayBuffer is detached',
+      );
     }
 
     firstPendingPullInto.buffer =

lib/internal/webstreams/util.js

@@ -31,6 +31,8 @@ const {
 } = internalBinding('buffer');
 
 const {
+  isArrayBuffer,
+  isArrayBufferView,
   isPromise,
 } = require('internal/util/types');
 
@@ -129,21 +131,32 @@ function transferArrayBuffer(buffer) {
   return res;
 }
 
-function isArrayBufferDetached(buffer) {
+function isDetachedBuffer(buffer) {
+  if (!isArrayBuffer(buffer))
+    throw new ERR_INVALID_ARG_TYPE('buffer', 'ArrayBuffer', buffer);
   if (ArrayBufferGetByteLength(buffer) === 0) {
+    // TODO(daeyeon): Consider using C++ builtin to improve performance.
     try {
       new Uint8Array(buffer);
-    } catch {
+    } catch (error) {
+      assert(error.name === 'TypeError');
       return true;
     }
   }
   return false;
 }
 
 function isViewedArrayBufferDetached(view) {
+  if (!isArrayBufferView(view)) {
+    throw new ERR_INVALID_ARG_TYPE(
+      'view',
+      ['Buffer', 'TypedArray', 'DataView'],
+      view,
+    );
+  }
   return (
     ArrayBufferViewGetByteLength(view) === 0 &&
-    isArrayBufferDetached(ArrayBufferViewGetBuffer(view))
+    isDetachedBuffer(ArrayBufferViewGetBuffer(view))
   );
 }
 
@@ -243,6 +256,7 @@ module.exports = {
   extractSizeAlgorithm,
   lazyTransfer,
   isBrandCheck,
+  isDetachedBuffer,
   isPromisePending,
   isViewedArrayBufferDetached,
   peekQueueValue,

test/parallel/test-whatwg-readablebytestream-bad-buffers-and-views.js

@@ -51,4 +51,48 @@ let pass = 0;
   reader.read(new Uint8Array([4, 5, 6]));
 }
 
+{
+  const stream = new ReadableStream({
+    start(c) {
+      c.enqueue(new Uint8Array([1, 2, 3]));
+    },
+    type: 'bytes',
+  });
+  const reader = stream.getReader({ mode: 'byob' });
+  const view = new Uint8Array();
+  reader
+    .read(view)
+    .then(common.mustNotCall())
+    .catch(
+      common.mustCall(
+        common.expectsError({
+          code: 'ERR_INVALID_STATE',
+          name: 'TypeError',
+        }),
+      ),
+    );
+}
+
+{
+  const stream = new ReadableStream({
+    start(c) {
+      c.enqueue(new Uint8Array([1, 2, 3]));
+    },
+    type: 'bytes',
+  });
+  const reader = stream.getReader({ mode: 'byob' });
+  const view = new Uint8Array(new ArrayBuffer(10), 0, 0);
+  reader
+    .read(view)
+    .then(common.mustNotCall())
+    .catch(
+      common.mustCall(
+        common.expectsError({
+          code: 'ERR_INVALID_STATE',
+          name: 'TypeError',
+        }),
+      ),
+    );
+}
+
 process.on('exit', () => assert.strictEqual(pass, 2));