Skip to content

net/streams: don't return the stream object from onStreamRead #34375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10 commits into from
Closed

net/streams: don't return the stream object from onStreamRead #34375

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0865a22
streams: don't return the stream object from onStreamRead
robey Jul 15, 2020
851667e
streams: fix 2nd instance
robey Jul 18, 2020
f646c23
add a link to the bug, by request
robey Jul 18, 2020
eea77a5
add a test that crashes without the fix.
robey Jul 19, 2020
98daa59
fix linter error
robey Jul 19, 2020
1440eae
add extra check in stream_base.cc to be extra sure.
robey Jul 19, 2020
965c0b4
undo "nice to have" which breaks some tests (sorry)
robey Jul 24, 2020
27bc342
give up on asserting that everyone sees the same error
robey Jul 24, 2020
4663458
make a guess about why new tests are failing
robey Jul 30, 2020
251a8c9
try removing the test completely
robey Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions lib/internal/stream_base_commons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,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
Expand All @@ -225,8 +227,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.
Expand Down