cvs: php-src /ext/dom php_dom.c

From: Date: Wed, 23 Nov 2005 00:55:35 +0000
Subject: cvs: php-src /ext/dom php_dom.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-35327@lists.php.net to get a copy of this message
rrichards Tue Nov 22 19:55:35 2005 EDT Modified files: /php-src/ext/dom php_dom.c Log: Fixed bug #35342 (isset(DOMNodeList->length) returns false). http://cvs.php.net/diff.php/php-src/ext/dom/php_dom.c?r1=1.83&r2=1.84&ty=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.83 php-src/ext/dom/php_dom.c:1.84 --- php-src/ext/dom/php_dom.c:1.83 Tue Nov 15 10:21:44 2005 +++ php-src/ext/dom/php_dom.c Tue Nov 22 19:55:34 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.83 2005/11/15 15:21:44 dmitry Exp $ */ +/* $Id: php_dom.c,v 1.84 2005/11/23 00:55:34 rrichards Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -324,6 +324,41 @@ } /* }}} */ +/* {{{ dom_property_exists */ +static int dom_property_exists(zval *object, zval *member, int check_empty TSRMLS_DC) +{ + dom_object *obj; + zval tmp_member; + dom_prop_handler *hnd; + zend_object_handlers *std_hnd; + int ret, retval=0; + + if (member->type != IS_STRING && member->type != IS_UNICODE) { + tmp_member = *member; + zval_copy_ctor(&tmp_member); + convert_to_text(&tmp_member); + member = &tmp_member; + } + + ret = FAILURE; + obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC); + + if (obj->prop_handler != NULL) { + ret = zend_u_hash_find(obj->prop_handler, Z_TYPE_P(member), Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, (void **) &hnd); + } + if (ret == SUCCESS) { + retval = 1; + } else { + std_hnd = zend_get_std_object_handlers(); + retval = std_hnd->has_property(object, member, check_empty TSRMLS_CC); + } + + if (member == &tmp_member) { + zval_dtor(member); + } + return retval; +} +/* }}} */ void *php_dom_export_node(zval *object TSRMLS_DC) { @@ -485,12 +520,14 @@ dom_object_handlers.write_property = dom_write_property; dom_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr; dom_object_handlers.clone_obj = dom_objects_store_clone_obj; + dom_object_handlers.has_property = dom_property_exists; 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_object_handlers.get_property_ptr_ptr = dom_get_property_ptr_ptr; dom_ze1_object_handlers.clone_obj = dom_objects_ze1_clone_obj; + dom_ze1_object_handlers.has_property = dom_property_exists; zend_hash_init(&classes, 0, NULL, (void (*)(void *))dom_prop_handlers_dtor, 1);

« previous php.cvs (#35327) next »