Skip to content

[pull] master from php:master #452

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

Merged
merged 13 commits into from
Dec 4, 2024
Merged

[pull] master from php:master #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7685fb0
Enable GHSA-9pqp-7h25-4f32.phpt on Windows
cmb69 Nov 25, 2024
c17b5ba
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 4, 2024
9c40bda
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Dec 4, 2024
fbba6df
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Dec 4, 2024
44e4f6d
Merge branch 'PHP-8.4'
cmb69 Dec 4, 2024
00f4881
Fix GH-17037: UAF in user filter when adding existing filter name due…
ndossche Dec 3, 2024
d6d7854
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Dec 4, 2024
f108eec
Merge branch 'PHP-8.4'
ndossche Dec 4, 2024
2285d70
Revert "Enable GHSA-9pqp-7h25-4f32.phpt on Windows"
cmb69 Dec 4, 2024
e532d9a
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Dec 4, 2024
e50cf7a
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Dec 4, 2024
88acd91
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Dec 4, 2024
bef96f3
Merge branch 'PHP-8.4'
cmb69 Dec 4, 2024
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
8 changes: 8 additions & 0 deletions ext/standard/tests/filters/gh17037.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--TEST--
GH-17037 (UAF in user filter when adding existing filter name due to incorrect error handling)
--FILE--
<?php
var_dump(stream_filter_register('string.toupper', 'filter_string_toupper'));
?>
--EXPECT--
bool(false)
12 changes: 8 additions & 4 deletions ext/standard/user_filters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,13 +521,17 @@ PHP_FUNCTION(stream_filter_register)
fdat = ecalloc(1, sizeof(struct php_user_filter_data));
fdat->classname = zend_string_copy(classname);

if (zend_hash_add_ptr(BG(user_filter_map), filtername, fdat) != NULL &&
php_stream_filter_register_factory_volatile(filtername, &user_filter_factory) == SUCCESS) {
RETVAL_TRUE;
if (zend_hash_add_ptr(BG(user_filter_map), filtername, fdat) != NULL) {
if (php_stream_filter_register_factory_volatile(filtername, &user_filter_factory) == SUCCESS) {
RETURN_TRUE;
}

zend_hash_del(BG(user_filter_map), filtername);
} else {
zend_string_release_ex(classname, 0);
efree(fdat);
RETVAL_FALSE;
}

RETURN_FALSE;
}
/* }}} */
Loading