Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #30875: xml_parse_into_struct() does not resolve entities
This commit is contained in:
Christoph M. Becker 2018-10-09 16:05:55 +02:00
commit ebecf569f9
3 changed files with 45 additions and 1 deletions

View file

@ -1437,7 +1437,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);