Skip to content

Fix memory leak when calling xml_parse_into_struct() twice #12254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix memory leak when calling xml_parse_into_struct() twice #12254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions ext/xml/tests/gh12254.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--TEST--
GH-12254: xml_parse_into_struct() memory leak when called twice
--EXTENSIONS--
xml
--FILE--
<?php

$parser = xml_parser_create();
xml_set_element_handler($parser, function ($parser, $name, $attrs) {
echo "open\n";
var_dump($name, $attrs);
var_dump(xml_parse_into_struct($parser, "<container/>", $values, $tags));
}, function ($parser, $name) {
echo "close\n";
var_dump($name);
});
xml_parse_into_struct($parser, "<container/>", $values, $tags);
// Yes, this doesn't do anything but it at least shouldn't leak...
xml_parse_into_struct($parser, "<container/>", $values, $tags);

?>
--EXPECTF--
open
string(9) "CONTAINER"
array(0) {
}

Warning: xml_parse_into_struct(): Parser must not be called recursively in %s on line %d
bool(false)
close
string(9) "CONTAINER"
27 changes: 17 additions & 10 deletions ext/xml/xml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,19 +353,24 @@ static zend_object *xml_parser_create_object(zend_class_entry *class_type) {
return &intern->std;
}

static void xml_parser_free_obj(zend_object *object)
static void xml_parser_free_ltags(xml_parser *parser)
{
xml_parser *parser = xml_parser_from_obj(object);

if (parser->parser) {
XML_ParserFree(parser->parser);
}
if (parser->ltags) {
int inx;
for (inx = 0; ((inx < parser->level) && (inx < XML_MAXLEVEL)); inx++)
efree(parser->ltags[ inx ]);
efree(parser->ltags);
}
}

static void xml_parser_free_obj(zend_object *object)
{
xml_parser *parser = xml_parser_from_obj(object);

if (parser->parser) {
XML_ParserFree(parser->parser);
}
xml_parser_free_ltags(parser);
if (!Z_ISUNDEF(parser->startElementHandler)) {
zval_ptr_dtor(&parser->startElementHandler);
}
Expand Down Expand Up @@ -1282,6 +1287,11 @@ PHP_FUNCTION(xml_parse_into_struct)

parser = Z_XMLPARSER_P(pind);

if (parser->isparsing) {
php_error_docref(NULL, E_WARNING, "Parser must not be called recursively");
RETURN_FALSE;
}

if (info) {
info = zend_try_array_init(info);
if (!info) {
Expand All @@ -1301,15 +1311,12 @@ PHP_FUNCTION(xml_parse_into_struct)
}

parser->level = 0;
xml_parser_free_ltags(parser);
parser->ltags = safe_emalloc(XML_MAXLEVEL, sizeof(char *), 0);

XML_SetElementHandler(parser->parser, _xml_startElementHandler, _xml_endElementHandler);
XML_SetCharacterDataHandler(parser->parser, _xml_characterDataHandler);

if (parser->isparsing) {
php_error_docref(NULL, E_WARNING, "Parser must not be called recursively");
RETURN_FALSE;
}
parser->isparsing = 1;
ret = XML_Parse(parser->parser, (XML_Char*)data, data_len, 1);
parser->isparsing = 0;
Expand Down