child_process: use addAbortListener

atlowChemi · juanarbol · commit 7d843bb942e5 · 2023-07-13T17:20:02.000-05:00
PR-URL: #48550 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -42,6 +42,7 @@ const {
   StringPrototypeIncludes,
   StringPrototypeSlice,
   StringPrototypeToUpperCase,
+  SymbolDispose,
 } = primordials;
 
 const {
@@ -95,6 +96,7 @@ const {
 const MAX_BUFFER = 1024 * 1024;
 
 const isZOS = process.platform === 'os390';
+let addAbortListener;
 
 /**
  * Spawns a new Node.js process + fork.
@@ -781,9 +783,9 @@ function spawn(file, args, options) {
     if (signal.aborted) {
       process.nextTick(onAbortListener);
     } else {
-      signal.addEventListener('abort', onAbortListener, { once: true });
-      child.once('exit',
-                 () => signal.removeEventListener('abort', onAbortListener));
+      addAbortListener ??= require('events').addAbortListener;
+      const disposable = addAbortListener(signal, onAbortListener);
+      child.once('exit', disposable[SymbolDispose]);
     }
 
     function onAbortListener() {
