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

diff --git a/NEWS b/NEWS
index 29700ad281ab8abb90806171ea4bc2fdd772d734..ab04592f7e78d790880a70bbec4369b58f164575 100644 (file)
--- 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 e067c518e8d9da5dde1e0af2b939ce77984f16d0..368ad7b5b3bc8b2c417c3a6af1d594df2d3991f3 100644 (file)
--- 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;