cvs: ZendEngine2 / zend_API.c

dmitry Wed Nov 23 08:30:21 2005 EDT Modified files: /ZendEngine2 zend_API.c Log: Additional fix for fix #35536 http://cvs.php.net/diff.php/ZendEngine2/zend_API.c?r1=1.328&r2=1.329&ty=u Index: ZendEngine2/zend_API.c diff -u ZendEngine2/zend_API.c:1.328 ZendEngine2/zend_API.c:1.329 --- ZendEngine2/zend_API.c:1.328 Wed Nov 23 06:57:43 2005 +++ ZendEngine2/zend_API.c Wed Nov 23 08:30:18 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_API.c,v 1.328 2005/11/23 11:57:43 tony2001 Exp $ */ +/* $Id: zend_API.c,v 1.329 2005/11/23 13:30:18 dmitry Exp $ */ #include "zend.h" #include "zend_execute.h" @@ -1079,6 +1079,7 @@ zval *member; TSRMLS_FETCH(); + MAKE_STD_ZVAL(member); if (hash_key->type == IS_STRING) { ZVAL_STRINGL(member, hash_key->u.string, hash_key->nKeyLength-1, 1); } else if (hash_key->type == IS_BINARY) { @@ -1087,7 +1088,6 @@ ZVAL_UNICODEL(member, hash_key->u.unicode, hash_key->nKeyLength-1, 1); } - MAKE_STD_ZVAL(member); obj_ht->write_property(obj, member, *value TSRMLS_CC); zval_ptr_dtor(&member); } @@ -1891,6 +1891,7 @@ { zval *z_key; + MAKE_STD_ZVAL(z_key); ZVAL_STRINGL(z_key, key, key_len-1, 1); Z_OBJ_HANDLER_P(arg, write_property)(arg, z_key, value TSRMLS_CC); @@ -3447,7 +3448,7 @@ ZEND_API zval *zend_read_property(zend_class_entry *scope, zval *object, char *name, int name_length, zend_bool silent TSRMLS_DC) { - zval property, *value; + zval *property, *value; zend_class_entry *old_scope = EG(scope); EG(scope) = scope; @@ -3459,8 +3460,11 @@ zend_get_object_classname(object, &class_name, &class_name_len TSRMLS_CC); zend_error(E_CORE_ERROR, "Property %s of class %v cannot be read", name, class_name); } - ZVAL_STRINGL(&property, name, name_length, 0); - value = Z_OBJ_HT_P(object)->read_property(object, &property, silent TSRMLS_CC); + + MAKE_STD_ZVAL(property); + ZVAL_STRINGL(property, name, name_length, 1); + value = Z_OBJ_HT_P(object)->read_property(object, property, silent TSRMLS_CC); + zval_ptr_dtor(&property); EG(scope) = old_scope; return value;