stream: throw TypeError when criteria fulfilled in getIterator

jakecastelli · targos · commit 713fc0c9ebf0 · 2024-10-02T07:57:21.000+02:00
PR-URL: #53825 Fixes: #53819 Refs: #53819 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Debadree Chatterjee <debadree333@gmail.com>
diff --git a/lib/internal/webstreams/util.js b/lib/internal/webstreams/util.js
@@ -18,6 +18,7 @@ const {
 
 const {
 codes: {
+ ERR_ARG_NOT_ITERABLE,
 ERR_INVALID_ARG_VALUE,
 ERR_OPERATION_FAILED,
 ERR_INVALID_STATE,
@@ -235,6 +236,11 @@ function getIterator(obj, kind = 'sync', method) {
 method = obj[SymbolAsyncIterator];
 if (method === undefined) {
 const syncMethod = obj[SymbolIterator];
+
+ if (syncMethod === undefined) {
+ throw new ERR_ARG_NOT_ITERABLE(obj);
+ }
+
 const syncIteratorRecord = getIterator(obj, 'sync', syncMethod);
 return createAsyncFromSyncIterator(syncIteratorRecord);
 }
@@ -243,6 +249,10 @@ function getIterator(obj, kind = 'sync', method) {
 }
 }
 
+ if (method === undefined) {
+ throw new ERR_ARG_NOT_ITERABLE(obj);
+ }
+
 const iterator = FunctionPrototypeCall(method, obj);
 if (typeof iterator !== 'object' || iterator === null) {
 throw new ERR_INVALID_STATE.TypeError('The iterator method must return an object');
diff --git a/test/parallel/test-webstream-readable-from.js b/test/parallel/test-webstream-readable-from.js
@@ -0,0 +1,9 @@
+'use strict';
+
+require('../common');
+const assert = require('node:assert');
+
+assert.throws(
+ () => ReadableStream.from({}),
+ { code: 'ERR_ARG_NOT_ITERABLE', name: 'TypeError' },
+);

-Original file line number
+Diff line change
 const{
 codes: {
 +ERR_ARG_NOT_ITERABLE,
 ERR_INVALID_ARG_VALUE,
 ERR_OPERATION_FAILED,
 ERR_INVALID_STATE,
 method=obj[SymbolAsyncIterator];
 if(method===undefined){
 constsyncMethod=obj[SymbolIterator];
++
 +if(syncMethod===undefined){
 +thrownewERR_ARG_NOT_ITERABLE(obj);
 +}
++
 constsyncIteratorRecord=getIterator(obj,'sync',syncMethod);
 returncreateAsyncFromSyncIterator(syncIteratorRecord);
+}
+}
+}
 +if(method===undefined){
 +thrownewERR_ARG_NOT_ITERABLE(obj);
 +}
++
 constiterator=FunctionPrototypeCall(method,obj);
 if(typeofiterator!=='object'||iterator===null){
 thrownewERR_INVALID_STATE.TypeError('The iterator method must return an object');