stream: fix isDetachedBuffer validations in ReadableStream

lib/internal/webstreams/readablestream.js

@@ -101,7 +101,7 @@ const {
   extractHighWaterMark,
   extractSizeAlgorithm,
   lazyTransfer,
-  isViewedArrayBufferDetached,
+  isDetachedBuffer,
   isBrandCheck,
   resetQueue,
   setPromiseHandled,
@@ -658,11 +658,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);
   }
 
@@ -681,7 +683,7 @@ class ReadableStreamBYOBRequest {
         'This BYOB request has been invalidated');
     }
 
-    if (isViewedArrayBufferDetached(view)) {
+    if (isDetachedBuffer(ArrayBufferViewGetBuffer(view))) {
       throw new ERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached');
     }
 
@@ -894,14 +896,23 @@ 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',
+        ),
+      );
+    }
+
+    if (isDetachedBuffer(viewBuffer)) {
+      return PromiseReject(
+        new ERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached'),
+      );
     }
     // Supposed to assert here that the view's buffer is not
     // detached, but there's no API available to use to check that.
@@ -2298,11 +2309,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

@@ -129,24 +129,15 @@ function transferArrayBuffer(buffer) {
   return res;
 }
 
-function isArrayBufferDetached(buffer) {
-  if (ArrayBufferGetByteLength(buffer) === 0) {
-    try {
-      new Uint8Array(buffer);
-    } catch {
-      return true;
-    }
+function isDetachedBuffer(buffer) {
+  try {
+    new Uint8Array(buffer);
+  } catch {
+    return true;
   }
   return false;
 }
 
-function isViewedArrayBufferDetached(view) {
-  return (
-    ArrayBufferViewGetByteLength(view) === 0 &&
-    isArrayBufferDetached(ArrayBufferViewGetBuffer(view))
-  );
-}
-
 function dequeueValue(controller) {
   assert(controller[kState].queue !== undefined);
   assert(controller[kState].queueTotalSize !== undefined);
@@ -243,8 +234,8 @@ module.exports = {
   extractSizeAlgorithm,
   lazyTransfer,
   isBrandCheck,
+  isDetachedBuffer,
   isPromisePending,
-  isViewedArrayBufferDetached,
   peekQueueValue,
   resetQueue,
   setPromiseHandled,

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));