com php-src: Fix bug #67392: dtrace breaks argument unpack: NEWS Zend/zend_execute.c

Commit: 6d1885342c1504a8697b41e075844b082f7b335f Author: Nikita Popov <nikic@php.net> Fri, 6 Jun 2014 17:09:49 +0200 Parents: 50b980f547f192dece017c4f267f9e15c9454854 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6d1885342c1504a8697b41e075844b082f7b335f Log: Fix bug #67392: dtrace breaks argument unpack Bugs: https://bugs.php.net/67392 Changed paths: M NEWS M Zend/zend_execute.c Diff: diff --git a/NEWS b/NEWS index 8c5fc36..7adf249 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2014, PHP 5.6.0 Release Candidate 1 +- Core: + . Fixed bug #67392 (dtrace breaks argument unpack). (Nikita) + 05 Jun 2014, PHP 5.6.0 Beta 4 - Core: 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 ); }