stream: callback should be called when pendingcb is 0 · nodejs/node@b3372a8 · GitHub

nodejs / node Public

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

• Code
• Issues 635
• Pull requests 755
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit b3372a8

Browse filesBrowse the repository at this point in the historyBrowse files

jakecastelli

authored and

targos

committed

stream: callback should be called when pendingcb is 0

Fixes: #46170 PR-URL: #53438 Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>

1 parent 4b47f89 commit b3372a8
Copy full SHA for b3372a8

2 files changed

+9-2Lines changed: 9 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal/streams
  • end-of-stream.js
• test/parallel
  • test-stream-finished.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/streams/end-of-stream.js‎

Copy file name to clipboardExpand all lines: lib/internal/streams/end-of-stream.js

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -213,7 +213,8 @@ function eos(stream, options, callback) {
213	213	} else if (
214	214	!readable &&
215	215	(!willEmitClose || isReadable(stream)) &&
216		- (writableFinished || isWritable(stream) === false)
	216	+ (writableFinished || isWritable(stream) === false) &&
	217	+ (wState == null || wState.pendingcb === 0)
217	218	) {
218	219	process.nextTick(onclosed);
219	220	} else if (

Collapse file

‎test/parallel/test-stream-finished.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-stream-finished.js

+7-1Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -669,15 +669,21 @@ testClosed((opts) => new Writable({ write() {}, ...opts }));
669	669	}
670	670
671	671	{
	672	+ let isCalled = false;
672	673	const stream = new Duplex({
673	674	write(chunk, enc, cb) {
674		- setImmediate(cb);
	675	+ setImmediate(() => {
	676	+ isCalled = true;
	677	+ cb();
	678	+ });
675	679	}
676	680	});
677	681
678	682	stream.end('foo');
679	683
680	684	finished(stream, { readable: false }, common.mustCall((err) => {
681	685	assert(!err);
	686	+ assert.strictEqual(isCalled, true);
	687	+ assert.strictEqual(stream._writableState.pendingcb, 0);
682	688	}));
683	689	}

0 commit comments

Comments

0 (0)