diff options
author | Rob Richards <rrichards@php.net> | 2004-01-20 11:35:32 +0000 |
---|---|---|
committer | Rob Richards <rrichards@php.net> | 2004-01-20 11:35:32 +0000 |
commit | a4815f7c8e9e7a5f5ccd9850402afc434f1d4353 (patch) | |
tree | 4f5589ac0c1b3889d0a080d5281ca76c52ce3e8b /ext/dom/dom_iterators.c | |
parent | 42110742b74c50779564a871d6e1211bea9203ef (diff) | |
download | php-git-a4815f7c8e9e7a5f5ccd9850402afc434f1d4353.tar.gz |
Warn when empty string supplied to load methods (by Pierre-Alain)
Fix refcount on xpath iterators
xpath_query should return nodelist even when empty
Diffstat (limited to 'ext/dom/dom_iterators.c')
-rw-r--r-- | ext/dom/dom_iterators.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index f71bc60e0e..6e027c243e 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -206,6 +206,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) zend_hash_move_forward(nodeht); if (zend_hash_get_current_data(nodeht, (void **) &entry)==SUCCESS) { curattr = *entry; + curattr->refcount++; } } else { curnode = (xmlNodePtr)((php_libxml_node_ptr *)intern->ptr)->node; @@ -273,6 +274,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object TS zend_hash_internal_pointer_reset(nodeht); if (zend_hash_get_current_data(nodeht, (void **) &entry)==SUCCESS) { curattr = *entry; + curattr->refcount++; } } else { nodep = (xmlNode *)dom_object_get_node(objmap->baseobj); |