summaryrefslogtreecommitdiff
path: root/lib/_stream_writable.js
diff options
context:
space:
mode:
authorMatteo Collina <hello@matteocollina.com>2017-06-21 20:04:12 +0200
committerMatteo Collina <hello@matteocollina.com>2017-06-22 23:53:24 +0200
commitb4432888f5f1beb6d6edfa47b27a25cc5bf06f3d (patch)
treefdbebf9bb489a0b9eddba9c9065e000efc866aa5 /lib/_stream_writable.js
parentc02dcc7b5983b2925016194002b9bc9a1e9da6c4 (diff)
downloadandroid-node-v8-b4432888f5f1beb6d6edfa47b27a25cc5bf06f3d.tar.gz
android-node-v8-b4432888f5f1beb6d6edfa47b27a25cc5bf06f3d.tar.bz2
android-node-v8-b4432888f5f1beb6d6edfa47b27a25cc5bf06f3d.zip
stream: finish must always follow error
When _write completes with an Error, 'finish' was emitted before 'error' if the callback was asynchronous. This commit restore the previous behavior. The logic is still less then ideal, because we call the write() callback before emitting error if asynchronous, but after if synchronous. This commit do not try to change the behavior. This commit fixes a regression introduced by: https://github.com/nodejs/node/pull/13195. Fixes: https://github.com/nodejs/node/issues/13812 PR-URL: https://github.com/nodejs/node/pull/13850 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Calvin Metcalf <calvin.metcalf@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'lib/_stream_writable.js')
-rw-r--r--lib/_stream_writable.js30
1 files changed, 19 insertions, 11 deletions
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index 615f5a3762..78ab13d906 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -374,18 +374,26 @@ function doWrite(stream, state, writev, len, chunk, encoding, cb) {
function onwriteError(stream, state, sync, er, cb) {
--state.pendingcb;
- if (sync)
- process.nextTick(afterError, stream, state, cb, er);
- else
- afterError(stream, state, cb, er);
-
- stream._writableState.errorEmitted = true;
- stream.emit('error', er);
-}
-function afterError(stream, state, cb, err) {
- cb(err);
- finishMaybe(stream, state);
+ if (sync) {
+ // defer the callback if we are being called synchronously
+ // to avoid piling up things on the stack
+ process.nextTick(cb, er);
+ // this can emit finish, and it will always happen
+ // after error
+ process.nextTick(finishMaybe, stream, state);
+ stream._writableState.errorEmitted = true;
+ stream.emit('error', er);
+ } else {
+ // the caller expect this to happen before if
+ // it is async
+ cb(er);
+ stream._writableState.errorEmitted = true;
+ stream.emit('error', er);
+ // this can emit finish, but finish must
+ // always follow error
+ finishMaybe(stream, state);
+ }
}
function onwriteStateUpdate(state) {