cvs: php-src(PHP_5_0) /ext/dom php_dom.c

rrichards Thu Jan 20 06:47:28 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/dom php_dom.c Log: MFH: Fixed bug #28817 (Var problem when extending domDocument) http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.60.2.4&r2=1.60.2.5&ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.60.2.4 php-src/ext/dom/php_dom.c:1.60.2.5 --- php-src/ext/dom/php_dom.c:1.60.2.4 Tue Jan 11 05:36:33 2005 +++ php-src/ext/dom/php_dom.c Thu Jan 20 06:47:28 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.60.2.4 2005/01/11 10:36:33 rrichards Exp $ */ +/* $Id: php_dom.c,v 1.60.2.5 2005/01/20 11:47:28 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -200,6 +200,38 @@ } /* }}} */ +static zval **dom_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) +{ + dom_object *obj; + zval tmp_member; + zval **retval = NULL; + dom_prop_handler *hnd; + zend_object_handlers *std_hnd; + int ret = FAILURE; + + if (member->type != IS_STRING) { + tmp_member = *member; + zval_copy_ctor(&tmp_member); + convert_to_string(&tmp_member); + member = &tmp_member; + } + + obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); + + if (obj->prop_handler != NULL) { + ret = zend_hash_find(obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_P(member)+1, (void **) &hnd); + } + if (ret == FAILURE) { + std_hnd = zend_get_std_object_handlers(); + retval = std_hnd->get_property_ptr_ptr(object, member TSRMLS_CC); + } + + if (member == &tmp_member) { + zval_dtor(member); + } + return retval; +} + /* {{{ dom_read_property */ zval *dom_read_property(zval *object, zval *member, int type TSRMLS_DC) { @@ -392,13 +424,13 @@ memcpy(&dom_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); dom_object_handlers.read_property = dom_read_property; dom_object_handlers.write_property = dom_write_property; - dom_object_handlers.get_property_ptr_ptr = NULL; + dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr; dom_object_handlers.clone_obj = dom_objects_store_clone_obj; memcpy(&dom_ze1_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); dom_ze1_object_handlers.read_property = dom_read_property; dom_ze1_object_handlers.write_property = dom_write_property; - dom_ze1_object_handlers.get_property_ptr_ptr = NULL; + dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr; dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj; zend_hash_init(&classes, 0, NULL, NULL, 1);