diff options
| author | Remi Collet <fedora@famillecollet.com> | 2014-06-10 16:11:30 +0200 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2014-06-10 16:11:30 +0200 |
| commit | 7b45c41bf35e7e2b90a0dd530f6f1ce32a0a1c3a (patch) | |
| tree | 49bb67e343321113516c16eaf161772320e32cb5 /php-bug67392.patch | |
| parent | 6eecd5405d3fb42390641ca958d9ca558ed8ab46 (diff) | |
PHP 5.6: add some upstream patches
Diffstat (limited to 'php-bug67392.patch')
| -rw-r--r-- | php-bug67392.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/php-bug67392.patch b/php-bug67392.patch new file mode 100644 index 0000000..ab9e1f8 --- /dev/null +++ b/php-bug67392.patch @@ -0,0 +1,27 @@ +From 6d1885342c1504a8697b41e075844b082f7b335f Mon Sep 17 00:00:00 2001 +From: Nikita Popov <nikic@php.net> +Date: Fri, 6 Jun 2014 17:09:49 +0200 +Subject: [PATCH] Fix bug #67392: dtrace breaks argument unpack + +--- + NEWS | 3 +++ + Zend/zend_execute.c | 3 ++- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c +index bdf8b6e..ad92c5f 100644 +--- a/Zend/zend_execute.c ++++ b/Zend/zend_execute.c +@@ -1490,7 +1490,8 @@ ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, zend_fcall_i + } else { + zval **return_value_ptr = &EX_TMP_VAR(execute_data_ptr, execute_data_ptr->opline->result.var)->var.ptr; + execute_data_ptr->function_state.function->internal_function.handler( +- execute_data_ptr->opline->extended_value, *return_value_ptr, return_value_ptr, ++ execute_data_ptr->opline->extended_value + execute_data_ptr->call->num_additional_args, ++ *return_value_ptr, return_value_ptr, + execute_data_ptr->object, return_value_used TSRMLS_CC + ); + } +-- +1.9.2 + |