Skip to content

Reject embedded NUL in SimpleXMLElement path/URL constructor #23069

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

Open
iliaal wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+35 −0
Open

Reject embedded NUL in SimpleXMLElement path/URL constructor #23069

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
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ PHP NEWS
. Fixed bug GH-23043 (broken session id code can cause zend_mm_heap
corrupted). (ndossche)

- SimpleXML:
. Fixed SimpleXMLElement::__construct() accepting embedded null bytes in
URL/path mode. (iliaal)

- Sockets:
. Fixed various memory related issues in ext/sockets. (David Carlier)

Expand Down
5 changes: 5 additions & 0 deletions ext/simplexml/simplexml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2334,6 +2334,11 @@ PHP_METHOD(SimpleXMLElement, __construct)
RETURN_THROWS();
}

if (is_url && CHECK_NULL_PATH(data, data_len)) {
zend_argument_value_error(1, "must not contain any null bytes");
RETURN_THROWS();
}

PHP_LIBXML_SANITIZE_GLOBALS(read_file_or_memory);
docp = is_url ? xmlReadFile(data, NULL, (int)options) : xmlReadMemory(data, (int)data_len, NULL, NULL, (int)options);
PHP_LIBXML_RESTORE_GLOBALS(read_file_or_memory);
Expand Down
26 changes: 26 additions & 0 deletions ext/simplexml/tests/bug_sxe_ctor_nul_path.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--TEST--
SimpleXMLElement constructor rejects embedded NUL in URL/path mode
--EXTENSIONS--
simplexml
--FILE--
<?php
$tmp = tempnam(sys_get_temp_dir(), 'sxe');
file_put_contents($tmp, '<r/>');
$path = $tmp . "\0evil";
try {
new SimpleXMLElement($path, 0, true);
echo "ctor: loaded\n";
} catch (Throwable $e) {
echo $e::class, ": ", $e->getMessage(), "\n";
}
try {
simplexml_load_file($path);
echo "load_file: loaded\n";
} catch (Throwable $e) {
echo $e::class, ": ", $e->getMessage(), "\n";
}
unlink($tmp);
?>
--EXPECT--
ValueError: SimpleXMLElement::__construct(): Argument #1 ($data) must not contain any null bytes
ValueError: simplexml_load_file(): Argument #1 ($filename) must not contain any null bytes
Loading