Fix bug #67392: dtrace breaks argument unpack

diff --git a/NEWS b/NEWS
index 8c5fc369d76ac9b4c408e7d8ff8ed3f3fdb3c862..7adf249ba58ae0cc1f3900c7b16ee4cca7255ef4 100644 (file)
--- 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 bdf8b6e70f06465998868751468dd4d565453fb0..ad92c5fb6f767158599500a293ecb7b01d885ccf 100644 (file)
--- 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
                );
        }