@@ -824,7 +824,8 @@ function spawn(file, args, options) {
       }
     }, options.timeout);
 
-    child.once('exit', () => {
+    // 'close' always fires after 'exit', or after 'error' on a spawn failure.
+    child.once('close', () => {
       if (timeoutId) {
         clearTimeout(timeoutId);
         timeoutId = null;
 
@@ -0,0 +1,19 @@
+'use strict';
+
+// Measures the child's actual exit time, not just its 'error' event.
+// The outer spawnSync timeout catches a leaked inner timer.
+
+const common = require('../common');
+const { spawnSyncAndExitWithoutError } = require('../common/child_process');
+
+const bugStallMs = common.platformTimeout(10000);
+const outerTimeoutMs = common.platformTimeout(2000);
+
+spawnSyncAndExitWithoutError(process.execPath, ['-e', `
+  const { spawn } = require('child_process');
+  const cp = spawn(process.execPath, ['--version'], {
+    cwd: '/nonexistent/path/that/should/never/exist',
+    timeout: ${bugStallMs},
+  });
+  cp.on('error', () => {});
+`], { timeout: outerTimeoutMs });
Original file line number	Diff line number	Diff line change
`@@ -824,7 +824,8 @@ function spawn(file, args, options) {`
`824`	`824`	`}`
`825`	`825`	`}, options.timeout);`
`826`	`826`
`827`		`- child.once('exit', () => {`
	`827`	`+ // 'close' always fires after 'exit', or after 'error' on a spawn failure.`
	`828`	`+ child.once('close', () => {`
`828`	`829`	`if (timeoutId) {`
`829`	`830`	`clearTimeout(timeoutId);`
`830`	`831`	`timeoutId = null;`