cvs: Zend(PHP_4_3) / zend_execute.c
| From: | Moriyoshi Koizumi | Date: | Fri, 05 Dec 2003 09:20:48 +0000 |
| Subject: | cvs: Zend(PHP_4_3) / zend_execute.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2079@lists.php.net to get a copy of this message | ||
moriyoshi Fri Dec 5 04:20:48 2003 EDT
Modified files: (Branch: PHP_4_3)
/Zend zend_execute.c
Log:
Revert crap.
Index: Zend/zend_execute.c
diff -u Zend/zend_execute.c:1.316.2.25 Zend/zend_execute.c:1.316.2.26
--- Zend/zend_execute.c:1.316.2.25 Thu Dec 4 08:42:42 2003
+++ Zend/zend_execute.c Fri Dec 5 04:20:48 2003
@@ -1310,19 +1310,11 @@
}
*/
zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1,
&EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC);
- if (EX(Ts)[EX(opline)->result.u.var].EA.type == IS_STRING_OFFSET) {
- zend_error(E_ERROR, "Cannot unset string offsets");
- } else {
- if (Z_TYPE_PP(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr) != IS_ARRAY) {
- zend_error(E_ERROR, "Illegal scalar dereference");
- }
-
- PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr);
- if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
- SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr);
- }
- PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr);
+ PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr);
+ if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) {
+ SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr);
}
+ PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr);
NEXT_OPCODE();
case ZEND_FETCH_OBJ_R:
zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1,
&EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC);