clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- This small patch should also take care of allowing unseting of $this->foo

Browse Source 
- and static members. The unset() opcode was luckily already suitable for
- object overloading.
This commit is contained in:
Andi Gutmans 2002-02-04 20:44:24 +00:00
parent e366f5dbd8
commit 8535164f21
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Zend/zend_execute.c
View File

@ -2500,6 +2500,10 @@ send_by_ref:
zval tmp, *variable = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R);
zval **object;
zend_bool unset_object;
HashTable *target_symbol_table;
target_symbol_table = zend_get_target_symbol_table(EX(opline), EX(Ts), BP_VAR_IS TSRMLS_CC);
/* Need to handle target_symbol_table == NULL */
if (variable->type != IS_STRING) {
tmp = *variable;
@ -2511,7 +2515,7 @@ send_by_ref:
unset_object = (EX(opline)->extended_value == ZEND_UNSET_OBJ);
if (unset_object) {
if (zend_hash_find(EG(active_symbol_table), variable->value.str.val, variable->value.str.len+1, (void **)&object) == FAILURE) {
if (zend_hash_find(target_symbol_table, variable->value.str.val, variable->value.str.len+1, (void **)&object) == FAILURE) {
zend_error(E_ERROR, "Cannot delete non-existing object");
}
if (Z_TYPE_PP(object) != IS_OBJECT) {
@ -2520,7 +2524,7 @@ send_by_ref:
(*object)->value.obj.handlers->delete_obj((*object)->value.obj.handle);
}
zend_hash_del(EG(active_symbol_table), variable->value.str.val, variable->value.str.len+1);
zend_hash_del(target_symbol_table, variable->value.str.val, variable->value.str.len+1);
if (variable == &tmp) {
zval_dtor(&tmp);
@ -2721,6 +2725,7 @@ send_by_ref:
HashTable *target_symbol_table;
target_symbol_table = zend_get_target_symbol_table(EX(opline), EX(Ts), BP_VAR_IS TSRMLS_CC);
/* Need to handle target_symbol_table == NULL */
if (variable->type != IS_STRING) {
tmp = *variable;