cvs: ZendEngine2 / zend_execute.c

moriyoshi Thu Dec 4 12:38:21 2003 EDT Modified files: /ZendEngine2 zend_execute.c Log: Revert crap. Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.559 ZendEngine2/zend_execute.c:1.560 --- ZendEngine2/zend_execute.c:1.559 Thu Dec 4 08:38:30 2003 +++ ZendEngine2/zend_execute.c Thu Dec 4 12:38:21 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.559 2003/12/04 13:38:30 moriyoshi Exp $ */ +/* $Id: zend_execute.c,v 1.560 2003/12/04 17:38:21 moriyoshi Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -1946,19 +1946,11 @@ } */ zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); - if (EX_T(EX(opline)->result.u.var).EA.type == IS_STRING_OFFSET) { - zend_error(E_ERROR, "Cannot unset string offsets"); - } else { - if (Z_TYPE_PP(EX_T(EX(opline)->result.u.var).var.ptr_ptr) != IS_ARRAY) { - zend_error(E_ERROR, "Illegal scalar dereference"); - } - - PZVAL_UNLOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr); - if (EX_T(EX(opline)->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) { - SEPARATE_ZVAL_IF_NOT_REF(EX_T(EX(opline)->result.u.var).var.ptr_ptr); - } - PZVAL_LOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr); + PZVAL_UNLOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr); + if (EX_T(EX(opline)->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(EX_T(EX(opline)->result.u.var).var.ptr_ptr); } + PZVAL_LOCK(*EX_T(EX(opline)->result.u.var).var.ptr_ptr); NEXT_OPCODE(); }