From 3840e428bbe8bbfd8ee9253808430a00d38d3ca9 Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Wed, 1 Mar 2006 17:21:04 +0000 Subject: [PATCH] - MFH Fix string-conversion and const updating --- Zend/zend.c | 7 ++++++- Zend/zend_API.c | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Zend/zend.c b/Zend/zend.c index 36972dff06..8c91586510 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -239,7 +239,12 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop 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; } } diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 45462bde3e..b67887de34 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -811,6 +811,7 @@ ZEND_API void zend_update_class_constants(zend_class_entry *class_type TSRMLS_DC 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)) { -- 2.50.1