net: don't return the stream object from onStreamRead · nodejs/node@b1890e0 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 638
• Pull requests 758
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit b1890e0

Browse filesBrowse the repository at this point in the historyBrowse files

robey

authored and

addaleax

committed

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 276e298 commit b1890e0
Copy full SHA for b1890e0

1 file changed

+8-3Lines changed: 8 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal
  • stream_base_commons.js

Expand file treeCollapse file tree

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 number	Diff line number	Diff line change
@@ -204,7 +204,9 @@ function onStreamRead(arrayBuffer) {
204	204	}
205	205
206	206	if (nread !== UV_EOF) {
207		- return stream.destroy(errnoException(nread, 'read'));
	207	+ // #34375 CallJSOnreadMethod expects the return value to be a buffer.
	208	+ stream.destroy(errnoException(nread, 'read'));
	209	+ return;
208	210	}
209	211
210	212	// Defer this until we actually emit end
@@ -221,8 +223,11 @@ function onStreamRead(arrayBuffer) {
221	223	// test-https-truncate test.
222	224	if (handle.readStop) {
223	225	const err = handle.readStop();
224		- if (err)
225		- return stream.destroy(errnoException(err, 'read'));
	226	+ if (err) {
	227	+ // #34375 CallJSOnreadMethod expects the return value to be a buffer.
	228	+ stream.destroy(errnoException(err, 'read'));
	229	+ return;
	230	+ }
226	231	}
227	232
228	233	// Push a null to signal the end of data.

0 commit comments

Comments

0 (0)