Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ PHP NEWS
(Kévin Dunglas)
. Fixed bug GH-24743 (var_export() ignores exceptions from lazy object
initialization). (lazerg)
. Fixed memory leak in get_meta_tags() when a tag opens while an attribute
value is expected. (Jorg Sowa)

- Streams:
. Fixed bug GH-22063 (Stream filter chain UAF on self-removal during
Expand Down
7 changes: 2 additions & 5 deletions ext/standard/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,13 +348,10 @@ PHP_FUNCTION(get_meta_tags)
} else {
add_assoc_string(return_value, name, "");
}

efree(name);
if (value) efree(value);
} else if (have_content) {
efree(value);
}

if (name) efree(name);
if (value) efree(value);
name = value = NULL;

/* Reset all of our flags */
Expand Down
25 changes: 25 additions & 0 deletions ext/standard/tests/strings/get_meta_tags_open_tag_leak.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
--TEST--
get_meta_tags() does not leak when a tag opens while an attribute value is expected
--FILE--
<?php

$filename = __DIR__."/get_meta_tags_open_tag_leak.html";

file_put_contents($filename, <<<HTML
<meta name="foo" content=<meta>
<meta content="bar" name=<meta>
<meta name="baz" content="qux">
HTML);

var_dump(get_meta_tags($filename));

?>
--CLEAN--
<?php
@unlink(__DIR__."/get_meta_tags_open_tag_leak.html");
?>
--EXPECT--
array(1) {
["baz"]=>
string(3) "qux"
}
Loading