summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2014-06-06 17:09:49 +0200
committerNikita Popov <nikic@php.net>2014-06-06 17:09:49 +0200
commit6d1885342c1504a8697b41e075844b082f7b335f (patch)
tree0dac0e8f8213ade05b4f3d6a2535b070a928255f /Zend/zend_execute.c
parent50b980f547f192dece017c4f267f9e15c9454854 (diff)
downloadphp-git-6d1885342c1504a8697b41e075844b082f7b335f.tar.gz
Fix bug #67392: dtrace breaks argument unpack
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index bdf8b6e70f..ad92c5fb6f 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
);
}