diff options
author | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-09 16:09:46 +0200 |
---|---|---|
committer | Christoph M. Becker <cmbecker69@gmx.de> | 2018-10-09 16:09:46 +0200 |
commit | f2856da6e833afc75ac58864a99625bed300e7da (patch) | |
tree | 8f19c47cfe9decc52915d21994a10f42b343e6b0 /ext/xml | |
parent | 6b015e51ad2bede4a9a0a303a29bd5bffd5788ee (diff) | |
parent | 54e152cb92d86d32b0474b11f380c621ff0c03ea (diff) | |
download | php-git-f2856da6e833afc75ac58864a99625bed300e7da.tar.gz |
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #30875: xml_parse_into_struct() does not resolve entities
Diffstat (limited to 'ext/xml')
-rw-r--r-- | ext/xml/tests/bug30875.phpt | 42 | ||||
-rw-r--r-- | ext/xml/xml.c | 1 |
2 files changed, 42 insertions, 1 deletions
diff --git a/ext/xml/tests/bug30875.phpt b/ext/xml/tests/bug30875.phpt new file mode 100644 index 0000000000..c5254e9668 --- /dev/null +++ b/ext/xml/tests/bug30875.phpt @@ -0,0 +1,42 @@ +--TEST-- +Bug #30875 (xml_parse_into_struct() does not resolve entities) +--SKIPIF-- +<?php +if (!extension_loaded('xml')) die('skip xml extension not available'); +?> +--FILE-- +<?php + +$xml = <<<XML +<!DOCTYPE dtd [ + <!ENTITY ref "ent"> +]> +<elt att="&ref;">a&ref;</elt> +XML; + +$parser = xml_parser_create(); +xml_parse_into_struct($parser, $xml, $vals); +xml_parser_free($parser); +var_dump($vals); +?> +===DONE=== +--EXPECT-- +array(1) { + [0]=> + array(5) { + ["tag"]=> + string(3) "ELT" + ["type"]=> + string(8) "complete" + ["level"]=> + int(1) + ["attributes"]=> + array(1) { + ["ATT"]=> + string(3) "ent" + } + ["value"]=> + string(4) "aent" + } +} +===DONE=== diff --git a/ext/xml/xml.c b/ext/xml/xml.c index 5d85b3aa3d..9b3baf6b9a 100644 --- a/ext/xml/xml.c +++ b/ext/xml/xml.c @@ -1459,7 +1459,6 @@ PHP_FUNCTION(xml_parse_into_struct) parser->level = 0; parser->ltags = safe_emalloc(XML_MAXLEVEL, sizeof(char *), 0); - XML_SetDefaultHandler(parser->parser, _xml_defaultHandler); XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler); XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler); |