diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-10-07 19:59:29 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-10-07 19:59:29 +0000 |
| commit | 36883fc891ff0c63c063dc20f606f521914b56e0 (patch) | |
| tree | 672903855401ab629c0102b516e35af990a5ab6a | |
| parent | f242191738dad020874d9a09b7d4160fd9f332f1 (diff) | |
| download | php-git-36883fc891ff0c63c063dc20f606f521914b56e0.tar.gz | |
MFB: Added missing safety checks (Problem identified by Coverity scan)
| -rw-r--r-- | ext/dom/dom_iterators.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index c06e612d87..104293f236 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -170,6 +170,8 @@ static int php_dom_iterator_current_key(zend_object_iterator *iter, zstr *str_ke intern = (dom_object *)zend_object_store_get_object(curobj TSRMLS_CC); if (intern != NULL && intern->ptr != NULL) { curnode = (xmlNodePtr)((php_libxml_node_ptr *)intern->ptr)->node; + } else { + return HASH_KEY_NON_EXISTANT; } namelen = xmlStrlen(curnode->name); @@ -220,8 +222,10 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) if (basenode && (basenode->type == XML_DOCUMENT_NODE || basenode->type == XML_HTML_DOCUMENT_NODE)) { basenode = xmlDocGetRootElement((xmlDoc *) basenode); - } else { + } else if (basenode) { basenode = basenode->children; + } else { + goto err; } curnode = dom_get_elements_by_tag_name_ns_raw(basenode, objmap->ns, objmap->local, &previndex, iter->index); } @@ -234,7 +238,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) } } } - +err: zval_ptr_dtor((zval**)&curobj); if (curnode) { MAKE_STD_ZVAL(curattr); @@ -288,6 +292,9 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i } } else { nodep = (xmlNode *)dom_object_get_node(objmap->baseobj); + if (!nodep) { + goto err; + } if (objmap->nodetype == XML_ATTRIBUTE_NODE || objmap->nodetype == XML_ELEMENT_NODE) { if (objmap->nodetype == XML_ATTRIBUTE_NODE) { curnode = (xmlNodePtr) nodep->properties; @@ -311,7 +318,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i } } } - +err: if (curnode) { MAKE_STD_ZVAL(curattr); curattr = php_dom_create_object(curnode, &ret, NULL, curattr, objmap->baseobj TSRMLS_CC); |