nodejs
diff --git a/Collapse file
‎lib/internal/streams/writable.js‎
Copy file name to clipboardExpand all lines: lib/internal/streams/writable.js
+19-9Lines changed: 19 additions & 9 deletions b/Collapse file
‎lib/internal/streams/writable.js‎
Copy file name to clipboardExpand all lines: lib/internal/streams/writable.js
+19-9Lines changed: 19 additions & 9 deletions
@@ -612,24 +612,31 @@ function onwrite(stream, er) {
     }
 
     if (sync) {
+      const needDrain = state.length === 0 && (state.state & kNeedDrain) !== 0;
+      const needTick = needDrain || (state.state & kDestroyed !== 0) || cb !== nop;
+
       // It is a common case that the callback passed to .write() is always
       // the same. In that case, we do not schedule a new nextTick(), but
       // rather just increase a counter, to improve performance and avoid
       // memory allocations.
       if (cb === nop) {
-        if ((state.state & kAfterWritePending) === 0) {
+        if ((state.state & kAfterWritePending) === 0 && needTick) {
           process.nextTick(afterWrite, stream, state, 1, cb);
           state.state |= kAfterWritePending;
         } else {
-          state.pendingcb -= 1;
+          state.pendingcb--;
+          finishMaybe(stream, state, true);
         }
-      } else if (state.afterWriteTickInfo !== null &&
-                 state.afterWriteTickInfo.cb === cb) {
-        state.afterWriteTickInfo.count++;
+      } else if ((state.state & kAfterWriteTickInfo) !== 0 &&
+                 state[kAfterWriteTickInfoValue].cb === cb) {
+        state[kAfterWriteTickInfoValue].count++;
+      } else if (needTick) {
+        state[kAfterWriteTickInfoValue] = { count: 1, cb, stream, state };
+        process.nextTick(afterWriteTick, state[kAfterWriteTickInfoValue]);
+        state.state |= (kAfterWritePending | kAfterWriteTickInfo);
       } else {
-        state.afterWriteTickInfo = { count: 1, cb, stream, state };
-        process.nextTick(afterWriteTick, state.afterWriteTickInfo);
-        state.state |= kAfterWritePending;
+        state.pendingcb--;
+        finishMaybe(stream, state, true);
       }
     } else {
       afterWrite(stream, state, 1, cb);
@@ -638,7 +645,8 @@ function onwrite(stream, er) {
 }
 
 function afterWriteTick({ stream, state, count, cb }) {
-  state.afterWriteTickInfo = null;
+  state.state &= ~kAfterWriteTickInfo;
+  state[kAfterWriteTickInfoValue] = null;
   return afterWrite(stream, state, count, cb);
 }
 
@@ -795,6 +803,8 @@ Writable.prototype.end = function(chunk, encoding, cb) {
   if (typeof cb === 'function') {
     if (err) {
       process.nextTick(cb, err);
+    } else if ((state.state & kErrored) !== 0) {
+      process.nextTick(cb, state[kErroredValue]);
     } else if ((state.state & kFinished) !== 0) {
       process.nextTick(cb, null);
     } else {