From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 7 Apr 2017 08:15:36 +0000 (+0800)
Subject: Fixed bug #74353 (Segfault when killing within bash script trap code)
X-Git-Tag: php-7.1.5RC1~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a796d18eefcc62a83199adb9db92913172f81b6;p=php

Fixed bug #74353 (Segfault when killing within bash script trap code)
---

diff --git a/NEWS b/NEWS
index 29700ad281..ab04592f7e 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                                        NEWS
 ?? ??? 2017, PHP 7.1.5
 
 - Core:
+  . Fixed bug #74353 (Segfault when killing within bash script trap code).
+    (Laruence)
   . Fixed bug #74340 (Magic function __get has different behavior in php 7.1.x).
     (Nikita)
 
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c
index e067c518e8..368ad7b5b3 100644
--- a/Zend/zend_signal.c
+++ b/Zend/zend_signal.c
@@ -210,7 +210,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context)
 #endif
 			}
 		}
-	} else {
+	} else if (p_sig.handler != SIG_IGN) {
 		if (p_sig.flags & SA_SIGINFO) {
 			if (p_sig.flags & SA_RESETHAND) {
 				SIGG(handlers)[signo-1].flags   = 0;