From: Moriyoshi Koizumi Date: Thu, 4 Dec 2003 17:38:21 +0000 (+0000) Subject: Revert crap. X-Git-Tag: php-5.0.0b3RC1~321 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a38020dddfb0fe778c91195230a064cb6406f43;p=php Revert crap. --- diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 2799b2a5bb..4671d889d4 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1946,19 +1946,11 @@ int zend_fetch_dim_unset_handler(ZEND_OPCODE_HANDLER_ARGS) } */ 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(); }