cvs: ZendEngine2(PHP_5_1) / zend.c zend_API.c

helly Wed Mar 1 17:21:04 2006 UTC Modified files: (Branch: PHP_5_1) /ZendEngine2 zend.c zend_API.c Log: - MFH Fix string-conversion and const updating http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend.c?r1=1.308.2.7&r2=1.308.2.8&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.308.2.7 ZendEngine2/zend.c:1.308.2.8 --- ZendEngine2/zend.c:1.308.2.7 Wed Jan 4 23:53:03 2006 +++ ZendEngine2/zend.c Wed Mar 1 17:21:04 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.308.2.7 2006/01/04 23:53:03 andi Exp $ */ +/* $Id: zend.c,v 1.308.2.8 2006/03/01 17:21:04 helly Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -239,7 +239,12 @@ zval *z = Z_OBJ_HANDLER_P(expr, get)(expr TSRMLS_CC); if(Z_TYPE_P(z) != IS_OBJECT) { zend_make_printable_zval(z, expr_copy, use_copy); - FREE_ZVAL(z); + if (*use_copy) { + FREE_ZVAL(z); + } else { + ZVAL_ZVAL(expr_copy, z, 0, 1); + *use_copy = 1; + } return; } } http://cvs.php.net/viewcvs.cgi/ZendEngine2/zend_API.c?r1=1.296.2.22&r2=1.296.2.23&diff_format=u Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.296.2.22 ZendEngine2/zend_API.c:1.296.2.23 --- ZendEngine2/zend_API.c:1.296.2.22 Mon Feb 27 22:23:21 2006 +++ ZendEngine2/zend_API.c Wed Mar 1 17:21:04 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.296.2.22 2006/02/27 22:23:21 helly Exp $ */ +/* $Id: zend_API.c,v 1.296.2.23 2006/03/01 17:21:04 helly Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -811,6 +811,7 @@ zend_class_entry *old_scope = *scope; *scope = class_type; + zend_hash_apply_with_argument(&class_type->constants_table, (apply_func_arg_t) zval_update_constant, (void*)1 TSRMLS_CC); zend_hash_apply_with_argument(&class_type->default_properties, (apply_func_arg_t) zval_update_constant, (void *) 1 TSRMLS_CC); if (!CE_STATIC_MEMBERS(class_type)) {