Patch bug63741.patch for SPL related Bug #63741

Patch version 2012-12-14 02:33 UTC

• 2012-12-14 02:33 UTC [diff to current]
• 2012-12-14 02:33 UTC [diff to current]

Developer: laruence@php.net

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index e6034ba..6c5551d 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1566,7 +1566,7 @@ void zend_free_compiled_variables(zend_execute_data *execute_data) /* {{{ */
  *                             +----------------------------------------+
  */
 
-static zend_always_inline zend_execute_data *i_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC) /* {{{ */
+static zend_execute_data *i_create_execute_data_from_op_array(zend_op_array *op_array, zend_bool nested TSRMLS_DC) /* {{{ */
 {
 	zend_execute_data *execute_data;
 
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index ef3f80e..0c4a112 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -2819,6 +2819,7 @@ ZEND_VM_HANDLER(60, ZEND_DO_FCALL, CONST, ANY)
 	}
 	call->fbc = EX(function_state).function;
 	call->object = NULL;
+	call->called_scope = NULL;
 	call->is_ctor_call = 0;
 	EX(call) = call;
 
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 4e4dedf..4e04caa 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -2296,6 +2296,7 @@ static int ZEND_FASTCALL  ZEND_DO_FCALL_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_A
 	}
 	call->fbc = EX(function_state).function;
 	call->object = NULL;
+	call->called_scope = NULL;
 	call->is_ctor_call = 0;
 	EX(call) = call;