events: remove error listener on signal abort

Fixes: #36949 PR-URL: #36969 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
nodejs · Jan 21, 2021 · abf0477 · abf0477
1 parent 4980cf7
commit abf0477
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/events.js b/lib/events.js
@@ -736,7 +736,7 @@ async function once(emitter, name, options = {}) {
     }
     function abortListener() {
       eventTargetAgnosticRemoveListener(emitter, name, resolver);
-      eventTargetAgnosticRemoveListener(emitter, 'error', resolver);
+      eventTargetAgnosticRemoveListener(emitter, 'error', errorListener);
       reject(lazyDOMException('The operation was aborted', 'AbortError'));
     }
     if (signal != null) {

diff --git a/test/parallel/test-events-once.js b/test/parallel/test-events-once.js
@@ -169,6 +169,19 @@ async function abortSignalAfterEvent() {
   await once(ee, 'foo', { signal: ac.signal });
 }
 
+async function abortSignalRemoveListener() {
+  const ee = new EventEmitter();
+  const ac = new AbortController();
+
+  try {
+    process.nextTick(() => ac.abort());
+    await once(ee, 'test', { signal: ac.signal });
+  } catch {
+    strictEqual(ee.listeners('test').length, 0);
+    strictEqual(ee.listeners('error').length, 0);
+  }
+}
+
 async function eventTargetAbortSignalBefore() {
   const et = new EventTarget();
   const ac = new AbortController();
@@ -218,6 +231,7 @@ Promise.all([
   abortSignalBefore(),
   abortSignalAfter(),
   abortSignalAfterEvent(),
+  abortSignalRemoveListener(),
   eventTargetAbortSignalBefore(),
   eventTargetAbortSignalAfter(),
   eventTargetAbortSignalAfterEvent(),