child_process: fix bad abort signal leak

Move abort signal validation to before spawn is executed so that the file is not leaked. lint
nodejs · Feb 7, 2021 · f4dbbf5 · f4dbbf5
1 parent d6e9446
commit f4dbbf5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/child_process.js b/lib/child_process.js
@@ -459,7 +459,7 @@ function normalizeSpawnArguments(file, args, options) {
   // Validate detached, if present.
   if (options.detached != null &&
       typeof options.detached !== 'boolean') {
-    throw new ERR_INVALID_ARG_TYPE('options.detached',
+      throw new ERR_INVALID_ARG_TYPE('options.detached',
                                    'boolean', options.detached);
   }
 
@@ -758,11 +758,14 @@ function spawnWithSignal(file, args, options) {
   const opts = options && typeof options === 'object' && ('signal' in options) ?
     { ...options, signal: undefined } :
     options;
-  const child = spawn(file, args, opts);
 
-  if (options && options.signal) {
+  if(options?.signal) {
     // Validate signal, if present
     validateAbortSignal(options.signal, 'options.signal');
+  }
+  const child = spawn(file, args, opts);
+
+  if (options && options.signal) {
     function kill() {
       if (child._handle) {
         child._handle.kill(options.killSignal || 'SIGTERM');