com php-src: Fix segfault in `pcntl_signal_handler` (bug #73939): ext/pcntl/pcntl.c ext/p cntl/php_pcntl.h
| From: | Joe Watkins | Date: | Sun, 15 Jan 2017 06:44:04 +0000 |
| Subject: | com php-src: Fix segfault in `pcntl_signal_handler` (bug #73939): ext/pcntl/pcntl.c ext/p cntl/php_pcntl.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96731@lists.php.net to get a copy of this message | ||
Commit: 3e274018f8e0dcd229cfc432786fde1aa981c859
Author: Adam Saponara <as@php.net> Sat, 14 Jan 2017 21:51:33 -0500
Committer: Joe Watkins <krakjoe@php.net> Sun, 15 Jan 2017 06:44:04 +0000
Parents: 959c8975a9a377aa2512833e80507d608769d56c
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3e274018f8e0dcd229cfc432786fde1aa981c859
Log:
Fix segfault in
pcntl_signal_handler (bug #73939)
Bugs:
https://bugs.php.net/73939
Changed paths:
M ext/pcntl/pcntl.c
M ext/pcntl/php_pcntl.h
Diff:
diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 0733519..a1ac069 100644
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -560,11 +560,6 @@ PHP_RSHUTDOWN_FUNCTION(pcntl)
while (PCNTL_G(head)) {
sig = PCNTL_G(head);
PCNTL_G(head) = sig->next;
-#ifdef HAVE_STRUCT_SIGINFO_T
- if (sig->siginfo) {
- zend_array_destroy(sig->siginfo);
- }
-#endif
efree(sig);
}
while (PCNTL_G(spares)) {
@@ -1379,11 +1374,7 @@ static void pcntl_signal_handler(int signo)
psig->next = NULL;
#ifdef HAVE_STRUCT_SIGINFO_T
- zval user_siginfo;
- array_init(&user_siginfo);
- pcntl_siginfo_to_zval(signo, siginfo, &user_siginfo);
- psig->siginfo = zend_array_dup(Z_ARRVAL(user_siginfo));
- zval_ptr_dtor(&user_siginfo);
+ psig->siginfo = *siginfo;
#endif
/* the head check is important, as the tick handler cannot atomically clear both
@@ -1428,14 +1419,14 @@ void pcntl_signal_dispatch()
PCNTL_G(head) = NULL; /* simple stores are atomic */
/* Allocate */
-
while (queue) {
if ((handle = zend_hash_index_find(&PCNTL_G(php_signal_table), queue->signo)) != NULL) {
if (Z_TYPE_P(handle) != IS_LONG) {
ZVAL_NULL(&retval);
ZVAL_LONG(¶ms[0], queue->signo);
#ifdef HAVE_STRUCT_SIGINFO_T
- ZVAL_ARR(¶ms[1], queue->siginfo);
+ array_init(¶ms[1]);
+ pcntl_siginfo_to_zval(queue->signo, &queue->siginfo, ¶ms[1]);
#else
ZVAL_NULL(¶ms[1]);
#endif
diff --git a/ext/pcntl/php_pcntl.h b/ext/pcntl/php_pcntl.h
index 865c496..1b13fb0 100644
--- a/ext/pcntl/php_pcntl.h
+++ b/ext/pcntl/php_pcntl.h
@@ -77,7 +77,7 @@ struct php_pcntl_pending_signal {
struct php_pcntl_pending_signal *next;
zend_long signo;
#ifdef HAVE_STRUCT_SIGINFO_T
- zend_array *siginfo;
+ siginfo_t siginfo;
#endif
};