From: Felipe Pena <felipe@php.net>
Date: Fri, 3 Jun 2011 00:35:22 +0000 (+0000)
Subject: - Fix crash in pcntl
X-Git-Tag: php-5.5.0alpha1~2012
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0aaedef71d0cf3bbce5d211ce2845faf92dc78be;p=php

- Fix crash in pcntl
---

diff --git a/ext/pcntl/php_signal.c b/ext/pcntl/php_signal.c
index 2985728759..2e5ce95316 100644
--- a/ext/pcntl/php_signal.c
+++ b/ext/pcntl/php_signal.c
@@ -18,6 +18,7 @@
 
 /* $Id$ */
 
+#include "TSRM.h"
 #include "php_signal.h"
 
 /* php_signal using sigaction is derrived from Advanced Programing
@@ -25,6 +26,9 @@
 Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
 {
 	struct sigaction act,oact;
+#ifdef ZEND_SIGNALS
+	TSRMLS_FETCH();
+#endif
 	act.sa_handler = func;
 	if (mask_all) {
 		sigfillset(&act.sa_mask);
@@ -42,7 +46,7 @@ Sigfunc *php_signal4(int signo, Sigfunc *func, int restart, int mask_all)
 #endif
 	}
 #ifdef ZEND_SIGNALS
-	if (zend_sigaction(signo, &act, &oact) < 0)
+	if (zend_sigaction(signo, &act, &oact TSRMLS_CC) < 0)
 #else
 	if (sigaction(signo, &act, &oact) < 0)
 #endif