Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix #30875: xml_parse_into_struct() does not resolve entities
This commit is contained in:
Christoph M. Becker 2018-10-09 16:09:46 +02:00
commit f2856da6e8
2 changed files with 42 additions and 1 deletions

View file

@ -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);