archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.3' into PHP-7.4

Browse source 
* PHP-7.3:
  Fix #79922: Crash after multiple calls to xml_parser_free()
This commit is contained in:
Christoph M. Becker 2020-08-10 12:25:08 +02:00
commit 2830c3ef52
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/xml/xml.c
View file

@ -1157,7 +1157,7 @@ static void php_xml_parser_create_impl(INTERNAL_FUNCTION_PARAMETERS, int ns_supp
XML_SetUserData(parser->parser, parser);
RETVAL_RES(zend_register_resource(parser, le_xml_parser));
ZVAL_COPY(&parser->index, return_value);
ZVAL_COPY_VALUE(&parser->index, return_value);
}
/* }}} */
@ -1589,7 +1589,7 @@ PHP_FUNCTION(xml_parser_free)
RETURN_FALSE;
}
if (zend_list_delete(Z_RES(parser->index)) == FAILURE) {
if (zend_list_close(Z_RES(parser->index)) == FAILURE) {
RETURN_FALSE;
}