php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-16 12:31:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix assignments to $this.

Browse Source 
Fixes the 'make install' problem reported on php-dev
This commit is contained in:
Zeev Suraski
2003-01-29 08:55:12 +00:00
parent 5c81fcfe70
commit 8f52bf6835
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Zend/zend_execute.c
View File

@@ -310,8 +310,18 @@ static inline void zend_assign_to_object(znode *result, znode *op1, znode *op2,
SEPARATE_ZVAL_IF_NOT_REF(object_ptr);
object = *object_ptr;
}
/* by now, property is a string */
/* here property is a string */
/* separate our value if necessary */
if (value_op->op_type == IS_TMP_VAR) {
zval *orig_value = value;
ALLOC_ZVAL(value);
*value = *orig_value;
value->is_ref = 0;
value->refcount = 0;
}
Z_OBJ_HT_P(object)->write_property(object, property, value TSRMLS_CC);
if (property == &tmp) {
zval_dtor(property);

4
Zend/zend_object_handlers.c
View File

@@ -220,7 +220,9 @@ static void zend_std_write_property(zval *object, zval *member, zval *value TSRM
/* To check: can't *variable_ptr be some system variable like error_zval here? */
(*variable_ptr)->type = value->type;
(*variable_ptr)->value = value->value;
zval_copy_ctor(*variable_ptr);
if (value->refcount>0) {
zval_copy_ctor(*variable_ptr);
}
setter_done = 1;
}
}