rebase fix

nodejs · Apr 27, 2020 · a77341e · a77341e
1 parent 8bad1c4
commit a77341e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/internal/streams/from.js b/lib/internal/streams/from.js
@@ -74,12 +74,13 @@ function from(Readable, iterable, opts) {
       needToClose = false;
       const { value, done } = await iterator.next();
       needToClose = !done;
-      const resolved = await value;
       if (done) {
         readable.push(null);
+      } else if (readable.destroyed) {
+        await close();
       } else {
         const res = await value;
-        if (res == null) throw new ERR_STREAM_NULL_VALUES();
+        if (res === null) readable.destroy(new ERR_STREAM_NULL_VALUES());
         if (readable.push(res)) {
           next();
         } else {