fixup: don't read more if failed

nodejs · Nov 17, 2021 · debd387 · debd387
1 parent aabfd75
commit debd387
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/lib/internal/streams/operators.js b/lib/internal/streams/operators.js
@@ -20,6 +20,7 @@ module.exports.map = function map(stream, fn, options) {
   const queue = [];
 
   let reading = false;
+  let failed = false;
 
   // TODO: What about hwm? This will cause some unnecessary buffering.
   const ret = new Readable({
@@ -70,6 +71,7 @@ module.exports.map = function map(stream, fn, options) {
     try {
       return [null, await val];
     } catch (err) {
+      failed = true;
       return [err, null];
     }
   }
@@ -82,21 +84,25 @@ module.exports.map = function map(stream, fn, options) {
   }
 
   function pump () {
-    while (queue.length < concurrency) {
-      let val = stream.read();
-      if (val === null) {
-        return;
-      }
-      try {
+    if (failed) {
+      return;
+    }
+    try {
+      while (queue.length < concurrency) {
+        let val = stream.read();
+        if (val === null) {
+          return;
+        }
         val = fn(val, { signal });
         if (val && typeof val.then === 'function') {
           enqueue(wrap(val));
         } else {
           enqueue([null, val]);
         }
-      } catch (err) {
-        enqueue([err, null]);
       }
+    } catch (err) {
+      failed = true;
+      enqueue([err, null]);
     }
   }