fixup: prepend error listener + test

nodejs · Oct 11, 2019 · aee2077 · aee2077
1 parent f71dcd9
commit aee2077
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
@@ -727,8 +727,8 @@ function onFinished(stream, state, cb) {
     stream.removeListener('error', onerror);
     cb();
   }
-  stream.on('finish', onfinish);
-  stream.on('error', onerror);
+  stream.prependListener('finish', onfinish);
+  stream.prependListener('error', onerror);
 }
 
 Object.defineProperty(Writable.prototype, 'destroyed', {

diff --git a/test/parallel/test-stream-writable-destroy.js b/test/parallel/test-stream-writable-destroy.js
@@ -328,3 +328,19 @@ const assert = require('assert');
   }));
   write.end();
 }
+
+{
+  // Call end(cb) after error & destroy and don't trigger
+  // unhandled exception.
+
+  const write = new Writable({
+    write(chunk, enc, cb) { process.nextTick(cb); }
+  });
+  write.once('error', common.mustCall((err) => {
+    assert.strictEqual(err.message, 'asd');
+  }));
+  write.end('asd', common.mustCall((err) => {
+    assert.strictEqual(err.message, 'asd');
+  }));
+  write.destroy(new Error('asd'));
+}