From c747e32813b0eadd24ec1685dd45530c2f94bf1e Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor@indutny.com>
Date: Thu, 19 Mar 2015 22:03:34 -0700
Subject: [PATCH] src: backport fix for SIGINT crash on FreeBSD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a backport of b64983d77cc3ed2e4b585f3bfc8ed23802389a52.

Original commit message:

  src: reset signal handler to SIG_DFL on FreeBSD

  FreeBSD has a nasty bug with SA_RESETHAND reseting the SA_SIGINFO,
  that is in turn set for a libthr wrapper. This leads to a crash.
  Work around the issue by manually setting SIG_DFL in the signal
  handler.

  Fix: https://github.com/joyent/node/issues/9326
  PR-URL: https://github.com/iojs/io.js/pull/1218
  Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
  Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>

Fixes #9326.
---
 src/node.cc                              | 12 ++++++++++++
 test/simple/test-regress-GH-node-9326.js | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 test/simple/test-regress-GH-node-9326.js

diff --git a/src/node.cc b/src/node.cc
index c8dfe041214..f0590d5a72b 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -2785,6 +2785,13 @@ static void AtExit() {
 
 static void SignalExit(int signo) {
   uv_tty_reset_mode();
+#ifdef __FreeBSD__
+  // FreeBSD has a nasty bug, see RegisterSignalHandler for details
+  struct sigaction sa;
+  memset(&sa, 0, sizeof(sa));
+  sa.sa_handler = SIG_DFL;
+  CHECK_EQ(sigaction(signo, &sa, nullptr), 0);
+#endif
   raise(signo);
 }
 
@@ -3163,7 +3170,12 @@ static void RegisterSignalHandler(int signal,
   struct sigaction sa;
   memset(&sa, 0, sizeof(sa));
   sa.sa_handler = handler;
+#ifndef __FreeBSD__
+  // FreeBSD has a nasty bug with SA_RESETHAND reseting the SA_SIGINFO, that is
+  // in turn set for a libthr wrapper. This leads to a crash.
+  // Work around the issue by manually setting SIG_DFL in the signal handler
   sa.sa_flags = reset_handler ? SA_RESETHAND : 0;
+#endif
   sigfillset(&sa.sa_mask);
   CHECK_EQ(sigaction(signal, &sa, NULL), 0);
 }
diff --git a/test/simple/test-regress-GH-node-9326.js b/test/simple/test-regress-GH-node-9326.js
new file mode 100644
index 00000000000..15a2abbdc55
--- /dev/null
+++ b/test/simple/test-regress-GH-node-9326.js
@@ -0,0 +1,12 @@
+var assert = require('assert');
+var child_process = require('child_process');
+
+// NOTE: Was crashing on FreeBSD
+var cp = child_process.spawn(process.execPath, [
+  '-e',
+  'process.kill(process.pid, "SIGINT")'
+]);
+
+cp.on('exit', function(code) {
+  assert.notEqual(code, 0);
+});