MFH

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index 7e94d51fb9f3cdc4a90d3df1e65b62c839d3bd35..55640c7a21a849c35e7f8ec700e06122c178083f 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1292,7 +1292,7 @@ ZEND_VM_HANDLER(97, ZEND_FETCH_OBJ_UNSET, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
 {
        zend_op *opline = EX(opline);
        zend_free_op free_op1, free_op2, free_res;
-       zval **container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_R);
+       zval **container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_R);
        zval *property = GET_OP2_ZVAL_PTR(BP_VAR_R);
 
        if (OP1_TYPE == IS_CV) {

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index acb5dc540666ff0ecb1924da5a24c696a019fe50..0d5d05e9d574173b567e3b7beeb29d30233eb606 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -15230,7 +15230,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CONST_HANDLER(ZEND_OPCODE_HANDLER_AR
 {
        zend_op *opline = EX(opline);
        zend_free_op free_res;
-       zval **container = NULL;
+       zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *property = &opline->op2.u.constant;
 
        if (IS_UNUSED == IS_CV) {
@@ -16379,7 +16379,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 {
        zend_op *opline = EX(opline);
        zend_free_op free_op2, free_res;
-       zval **container = NULL;
+       zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *property = _get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (IS_UNUSED == IS_CV) {
@@ -17487,7 +17487,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS
 {
        zend_op *opline = EX(opline);
        zend_free_op free_op2, free_res;
-       zval **container = NULL;
+       zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *property = _get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC);
 
        if (IS_UNUSED == IS_CV) {
@@ -18962,7 +18962,7 @@ static int ZEND_FETCH_OBJ_UNSET_SPEC_UNUSED_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 {
        zend_op *opline = EX(opline);
        zend_free_op free_res;
-       zval **container = NULL;
+       zval **container = _get_obj_zval_ptr_ptr_unused(TSRMLS_C);
        zval *property = _get_zval_ptr_cv(&opline->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
 
        if (IS_UNUSED == IS_CV) {