php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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
parent 2d087210eb 0af3f49312
commit 2830c3ef52
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NEWS
+3
View File
@@ -29,6 +29,9 @@ PHP NEWS
. Fixed bug #79930 (array_merge_recursive() crashes when called with array
with single reference). (Nikita)
- XML:
. Fixed bug #79922 (Crash after multiple calls to xml_parser_free()). (cmb)
06 Aug 2020, PHP 7.4.9
- Apache:
ext/xml/tests/bug79922.phpt
+17
View File
@@ -0,0 +1,17 @@
--TEST--
Bug #79922 (Crash after multiple calls to xml_parser_free())
--SKIPIF--
<?php
if (!extension_loaded('xml')) die('skip xml extension not available');
?>
--FILE--
<?php
$c=xml_parser_create_ns();
$a=xml_parser_free($c);
$a=xml_parser_free($c);
$c=0;
var_dump($a);
?>
--EXPECTF--
Warning: xml_parser_free(): supplied resource is not a valid XML Parser resource in %s on line %d
bool(false)
ext/xml/xml.c
+2 -2
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;
}