]> granicus.if.org Git - php/commitdiff
Revert crap.
authorMoriyoshi Koizumi <moriyoshi@php.net>
Thu, 4 Dec 2003 17:38:21 +0000 (17:38 +0000)
committerMoriyoshi Koizumi <moriyoshi@php.net>
Thu, 4 Dec 2003 17:38:21 +0000 (17:38 +0000)
Zend/zend_execute.c

index 2799b2a5bb5ceb50ac2d74d6aa02008b60cd70b5..4671d889d478dbcc90b3fb41578ea330c9bb85b8 100644 (file)
@@ -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();
 }