stream: fix isDetachedBuffer validations

Signed-off-by: Daeyeon Jeong daeyeon.dev@gmail.com
PR-URL: #44114
Refs: #43866
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

Author: daeyeon

lib/internal/webstreams/readablestream.js

@@ -59,6 +59,7 @@ const {
 }=require('v8');
 
 const{
+ validateBuffer,
  validateObject,
 }=require('internal/validators');
 
@@ -101,6 +102,7 @@ const {
  extractHighWaterMark,
  extractSizeAlgorithm,
  lazyTransfer,
+ isDetachedBuffer,
  isViewedArrayBufferDetached,
  isBrandCheck,
  resetQueue,
@@ -658,11 +660,13 @@ class ReadableStreamBYOBRequest {
 constviewBuffer=ArrayBufferViewGetBuffer(view);
 constviewBufferByteLength=ArrayBufferGetByteLength(viewBuffer);
 
-if(viewByteLength===0||viewBufferByteLength===0){
-thrownewERR_INVALID_STATE.TypeError(
-'View ArrayBuffer is zero-length or detached');
+if(isDetachedBuffer(viewBuffer)){
+thrownewERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached');
 }
 
+assert(viewByteLength>0);
+assert(viewBufferByteLength>0);
+
 readableByteStreamControllerRespond(controller,bytesWritten);
 }
 
@@ -681,6 +685,8 @@ class ReadableStreamBYOBRequest {
 'This BYOB request has been invalidated');
 }
 
+validateBuffer(view,'view');
+
 if(isViewedArrayBufferDetached(view)){
 thrownewERR_INVALID_STATE.TypeError('Viewed ArrayBuffer is detached');
 }
@@ -894,15 +900,19 @@ class ReadableStreamBYOBReader {
 ],
 view));
 }
+
 constviewByteLength=ArrayBufferViewGetByteLength(view);
 constviewBuffer=ArrayBufferViewGetBuffer(view);
 constviewBufferByteLength=ArrayBufferGetByteLength(viewBuffer);
 
 if(viewByteLength===0||viewBufferByteLength===0){
 returnPromiseReject(
 newERR_INVALID_STATE.TypeError(
-'View ArrayBuffer is zero-length or detached'));
+'View or Viewed ArrayBuffer is zero-length or detached',
+),
+);
 }
+
 // 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 +2308,10 @@ function readableByteStreamControllerEnqueue(
 if(pendingPullIntos.length){
 constfirstPendingPullInto=pendingPullIntos[0];
 
-constpendingBufferByteLength=
-ArrayBufferGetByteLength(firstPendingPullInto.buffer);
-if(pendingBufferByteLength===0){
+if(isDetachedBuffer(firstPendingPullInto.buffer)){
 thrownewERR_INVALID_STATE.TypeError(
-'Destination ArrayBuffer is zero-length or detached');
+'Destination ArrayBuffer is detached',
+);
 }
 
 firstPendingPullInto.buffer=
@@ -2501,16 +2510,6 @@ function readableByteStreamControllerRespondWithNewView(controller, view) {
 constdesc=pendingPullIntos[0];
 assert(stream[kState].state!=='errored');
 
-if(!isArrayBufferView(view)){
-thrownewERR_INVALID_ARG_TYPE(
-'view',
-[
-'Buffer',
-'TypedArray',
-'DataView',
-],
-view);
-}
 constviewByteLength=ArrayBufferViewGetByteLength(view);
 constviewByteOffset=ArrayBufferViewGetByteOffset(view);
 constviewBuffer=ArrayBufferViewGetBuffer(view);

lib/internal/webstreams/util.js

@@ -129,11 +129,13 @@ function transferArrayBuffer(buffer) {
 returnres;
 }
 
-functionisArrayBufferDetached(buffer){
+functionisDetachedBuffer(buffer){
 if(ArrayBufferGetByteLength(buffer)===0){
+// TODO(daeyeon): Consider using C++ builtin to improve performance.
 try{
 newUint8Array(buffer);
-}catch{
+}catch(error){
+assert(error.name==='TypeError');
 returntrue;
 }
 }
@@ -143,7 +145,7 @@ function isArrayBufferDetached(buffer) {
 functionisViewedArrayBufferDetached(view){
 return(
 ArrayBufferViewGetByteLength(view)===0&&
-isArrayBufferDetached(ArrayBufferViewGetBuffer(view))
+isDetachedBuffer(ArrayBufferViewGetBuffer(view))
 );
 }
 
@@ -243,6 +245,7 @@ module.exports = {
  extractSizeAlgorithm,
  lazyTransfer,
  isBrandCheck,
+ isDetachedBuffer,
  isPromisePending,
  isViewedArrayBufferDetached,
  peekQueueValue,

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

@@ -51,4 +51,38 @@ let pass = 0;
 reader.read(newUint8Array([4,5,6]));
 }
 
+{
+conststream=newReadableStream({
+start(c){
+c.enqueue(newUint8Array([1,2,3]));
+},
+type: 'bytes',
+});
+constreader=stream.getReader({mode: 'byob'});
+constview=newUint8Array();
+assert
+.rejects(reader.read(view),{
+code: 'ERR_INVALID_STATE',
+name: 'TypeError',
+})
+.then(common.mustCall());
+}
+
+{
+conststream=newReadableStream({
+start(c){
+c.enqueue(newUint8Array([1,2,3]));
+},
+type: 'bytes',
+});
+constreader=stream.getReader({mode: 'byob'});
+constview=newUint8Array(newArrayBuffer(10),0,0);
+assert
+.rejects(reader.read(view),{
+code: 'ERR_INVALID_STATE',
+name: 'TypeError',
+})
+.then(common.mustCall());
+}
+
 process.on('exit',()=>assert.strictEqual(pass,2));