Fixed bug #35342 (isset(DOMNodeList->length) returns false)

add test

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 12f266ae67532b51f46a886c406a4fffd881cf76..41b67d039071cc39ecff3f6a9f280e7073265044 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -346,6 +346,41 @@ void dom_write_property(zval *object, zval *member, zval *value TSRMLS_DC)
 }
 /* }}} */
 
+/* {{{ 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) {
+               tmp_member = *member;
+               zval_copy_ctor(&tmp_member);
+               convert_to_string(&tmp_member);
+               member = &tmp_member;
+       }
+
+       ret = FAILURE;
+       obj = (dom_object *)zend_objects_get_address(object TSRMLS_CC);
+
+       if (obj->prop_handler != NULL) {
+               ret = zend_hash_find((HashTable *)obj->prop_handler, Z_STRVAL_P(member), Z_STRLEN_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)
 {
@@ -468,12 +503,14 @@ PHP_MINIT_FUNCTION(dom)
        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, NULL, 1);
 

diff --git a/ext/dom/tests/bug35342.phpt b/ext/dom/tests/bug35342.phpt
new file mode 100644 (file)
index 0000000..2aab385
--- /dev/null
+++ b/ext/dom/tests/bug35342.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Bug # 35342: isset(DOMNodeList->length) returns false
+--SKIPIF--
+<?php require_once('skipif.php'); ?>
+--FILE--
+<?php
+$dom = new DOMDocument();
+$dom->loadXML("<root><foo>foobar</foo><foo>foobar#2</foo></root>");
+
+$nodelist = $dom->getElementsByTagName("foo");
+
+var_dump($nodelist->length, isset($nodelist->length), isset($nodelist->foo));
+?>
+--EXPECT--
+int(2)
+bool(true)
+bool(false)