net: don't return the stream object from onStreamRead

CallJSOnreadMethod expects the return value to be undefined or a new buffer, so make sure to return nothing, even when an error causes us to destroy the stream. Fixes: #34346 PR-URL: #34375 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
nodejs · Aug 11, 2020 · 7887ce2 · 7887ce2
1 parent 3ecb16b
commit 7887ce2
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/internal/stream_base_commons.js b/lib/internal/stream_base_commons.js
@@ -204,7 +204,9 @@ function onStreamRead(arrayBuffer) {
   }
 
   if (nread !== UV_EOF) {
-    return stream.destroy(errnoException(nread, 'read'));
+    // #34375 CallJSOnreadMethod expects the return value to be a buffer.
+    stream.destroy(errnoException(nread, 'read'));
+    return;
   }
 
   // Defer this until we actually emit end
@@ -221,8 +223,11 @@ function onStreamRead(arrayBuffer) {
     // test-https-truncate test.
     if (handle.readStop) {
       const err = handle.readStop();
-      if (err)
-        return stream.destroy(errnoException(err, 'read'));
+      if (err) {
+        // #34375 CallJSOnreadMethod expects the return value to be a buffer.
+        stream.destroy(errnoException(err, 'read'));
+        return;
+      }
     }
 
     // Push a null to signal the end of data.