From 784eb2fd65ab0e17f3ec15b801c8e9d78866681a Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Fri, 10 Feb 2017 10:00:19 -0500
Subject: [PATCH] child_process: exit spawnSync with null on signal

This commit sets the spawnSync() exit code to null when the
child is killed via signal. This brings the behavior more in
sync with spawn().

Fixes: https://github.com/nodejs/node/issues/11284
PR-URL: https://github.com/nodejs/node/pull/11288
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
---
 src/spawn_sync.cc                                   | 13 +++++++++----
 .../test-child-process-spawnsync-kill-signal.js     |  5 ++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/spawn_sync.cc b/src/spawn_sync.cc
index 93e51af38f..8ef78a796d 100644
--- a/src/spawn_sync.cc
+++ b/src/spawn_sync.cc
@@ -650,12 +650,17 @@ Local<Object> SyncProcessRunner::BuildResultObject() {
                    Integer::New(env()->isolate(), GetError()));
   }
 
-  if (exit_status_ >= 0)
-    js_result->Set(env()->status_string(),
-        Number::New(env()->isolate(), static_cast<double>(exit_status_)));
-  else
+  if (exit_status_ >= 0) {
+    if (term_signal_ > 0) {
+      js_result->Set(env()->status_string(), Null(env()->isolate()));
+    } else {
+      js_result->Set(env()->status_string(),
+          Number::New(env()->isolate(), static_cast<double>(exit_status_)));
+    }
+  } else {
     // If exit_status_ < 0 the process was never started because of some error.
     js_result->Set(env()->status_string(), Null(env()->isolate()));
+  }
 
   if (term_signal_ > 0)
     js_result->Set(env()->signal_string(),
diff --git a/test/parallel/test-child-process-spawnsync-kill-signal.js b/test/parallel/test-child-process-spawnsync-kill-signal.js
index 8a3c362216..b0d47e0aa6 100644
--- a/test/parallel/test-child-process-spawnsync-kill-signal.js
+++ b/test/parallel/test-child-process-spawnsync-kill-signal.js
@@ -1,12 +1,11 @@
 'use strict';
-const common = require('../common');
+require('../common');
 const assert = require('assert');
 const cp = require('child_process');
 
 if (process.argv[2] === 'child') {
   setInterval(() => {}, 1000);
 } else {
-  const exitCode = common.isWindows ? 1 : 0;
   const { SIGKILL } = process.binding('constants').os.signals;
 
   function spawn(killSignal) {
@@ -14,7 +13,7 @@ if (process.argv[2] === 'child') {
                                [__filename, 'child'],
                                {killSignal, timeout: 100});
 
-    assert.strictEqual(child.status, exitCode);
+    assert.strictEqual(child.status, null);
     assert.strictEqual(child.error.code, 'ETIMEDOUT');
     return child;
   }