Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 09056fd

Browse filesBrowse files
robeyaddaleax
authored andcommitted
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 <luigipinca@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
1 parent e9a8f0c commit 09056fd
Copy full SHA for 09056fd

File tree

Expand file treeCollapse file tree

1 file changed

+8
-3
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+8
-3
lines changed
Open diff view settings
Collapse file

‎lib/internal/stream_base_commons.js‎

Copy file name to clipboardExpand all lines: lib/internal/stream_base_commons.js
+8-3Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@ function onStreamRead(arrayBuffer) {
202202
}
203203

204204
if (nread !== UV_EOF) {
205-
return stream.destroy(errnoException(nread, 'read'));
205+
// #34375 CallJSOnreadMethod expects the return value to be a buffer.
206+
stream.destroy(errnoException(nread, 'read'));
207+
return;
206208
}
207209

208210
// Defer this until we actually emit end
@@ -219,8 +221,11 @@ function onStreamRead(arrayBuffer) {
219221
// test-https-truncate test.
220222
if (handle.readStop) {
221223
const err = handle.readStop();
222-
if (err)
223-
return stream.destroy(errnoException(err, 'read'));
224+
if (err) {
225+
// #34375 CallJSOnreadMethod expects the return value to be a buffer.
226+
stream.destroy(errnoException(err, 'read'));
227+
return;
228+
}
224229
}
225230

226231
// Push a null to signal the end of data.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.