Browse Source

- Fixed missing NULL check in SimpleXMLElement::xpath()

pull/684/head
Felipe Pena 12 years ago
parent
commit
345f6d90d5
  1. 3
      ext/simplexml/simplexml.c
  2. 8
      ext/simplexml/tests/SimpleXMLElement_xpath.phpt

3
ext/simplexml/simplexml.c

@ -1270,6 +1270,9 @@ SXE_METHOD(xpath)
if (!sxe->node) {
php_libxml_increment_node_ptr((php_libxml_node_object *)sxe, xmlDocGetRootElement((xmlDocPtr) sxe->document->ptr), NULL TSRMLS_CC);
}
if (!sxe->node) {
RETURN_FALSE;
}
nodeptr = php_sxe_get_first_node(sxe, sxe->node->node TSRMLS_CC);

8
ext/simplexml/tests/SimpleXMLElement_xpath.phpt

@ -0,0 +1,8 @@
--TEST--
Testing xpath() with invalid XML
--FILE--
<?php
$xml = @simplexml_load_string("XXXXXXX^",$x,0x6000000000000001);
var_dump($xml->xpath("BBBB"));
--EXPECT--
bool(false)
Loading…
Cancel
Save