Fix bug #67392: dtrace breaks argument unpack

This commit is contained in:
Nikita Popov 2014-06-06 17:09:49 +02:00
parent 50b980f547
commit 6d1885342c
2 changed files with 5 additions and 1 deletions

3
NEWS
View File

@ -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:

View File

@ -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
);
}