Skip to content
Merged
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
19 changes: 19 additions & 0 deletions Zend/zend_execute_API.c
Original file line number Diff line number Diff line change
Expand Up @@ -823,6 +823,7 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
zend_function *func;
uint32_t call_info;
void *object_or_called_scope;
zend_object *pinned_this = NULL;

ZVAL_UNDEF(fci->retval);

Expand Down Expand Up @@ -866,12 +867,17 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
} else {
object_or_called_scope = fci_cache->object;
call_info = ZEND_CALL_TOP_FUNCTION | ZEND_CALL_DYNAMIC | ZEND_CALL_HAS_THIS;
pinned_this = fci_cache->object;
GC_ADDREF(pinned_this);
}

if (UNEXPECTED(func->common.fn_flags & ZEND_ACC_DEPRECATED)) {
zend_deprecated_function(func);

if (UNEXPECTED(EG(exception))) {
if (pinned_this) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside: it seems zend_release_fcall_info_cache might be missing here if __call() has a deprecate attribute?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, and the same is missing from the zend_handle_undef_args() return further down. Both predate this PR: 256 bytes a call on master, with a #[\Deprecated] __call() for the first and [Closure::fromCallable('strcmp'), '__invoke'] called with only $string2 for the second.

Separate PR?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, as those probably should be backported as its a mem leak

OBJ_RELEASE(pinned_this);
}
return SUCCESS;
}
}
Expand All @@ -880,6 +886,9 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
if (UNEXPECTED(zend_call_stack_overflowed(EG(stack_limit)))) {
zend_call_stack_size_error();
zend_release_fcall_info_cache(fci_cache);
if (pinned_this) {
OBJ_RELEASE(pinned_this);
}
return SUCCESS;
}
#endif
Expand Down Expand Up @@ -917,6 +926,9 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
}
zend_vm_stack_free_call_frame(call);
zend_release_fcall_info_cache(fci_cache);
if (pinned_this) {
OBJ_RELEASE(pinned_this);
}
return SUCCESS;
}
}
Expand Down Expand Up @@ -1010,6 +1022,9 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
if (zend_handle_undef_args(call) == FAILURE) {
zend_vm_stack_free_args(call);
zend_vm_stack_free_call_frame(call);
if (pinned_this) {
OBJ_RELEASE(pinned_this);
}
return SUCCESS;
}
}
Expand Down Expand Up @@ -1096,6 +1111,10 @@ zend_result zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_
}
EG(fake_scope) = orig_fake_scope;

if (pinned_this) {
OBJ_RELEASE(pinned_this);
}

zend_vm_stack_free_call_frame(call);

if (UNEXPECTED(EG(exception))) {
Expand Down
40 changes: 40 additions & 0 deletions ext/pdo_sqlite/tests/gh22122.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--TEST--
GH-22122 (Use-after-free in Pdo\Sqlite authorizer when callback releases the authorizer)
--EXTENSIONS--
pdo_sqlite
--FILE--
<?php
$db = Pdo\Sqlite::connect('sqlite::memory:');

class Auth {
public string $state = "alive";

public function authorize(int $action, ...$args): int {
global $db;
$db->setAuthorizer(null);
echo "method: ", $this->state, "\n";
return Pdo\Sqlite::OK;
}
}
$auth = new Auth();
$db->setAuthorizer([$auth, 'authorize']);
unset($auth);
$db->exec('SELECT 1');

$capture = "closure-alive";
$closure = function (int $action, ...$args) use (&$capture, $db): int {
$db->setAuthorizer(null);
echo "closure: ", $capture, "\n";
return Pdo\Sqlite::OK;
};
$db->setAuthorizer($closure);
unset($closure);
$db->exec('SELECT 2');

$db->exec('SELECT 3');
echo "post-disable query ok\n";
?>
--EXPECT--
method: alive
closure: closure-alive
post-disable query ok
27 changes: 27 additions & 0 deletions ext/spl/tests/autoloading/gh22060.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
GH-22060 (Class autoloader $this freed via spl_autoload_unregister during dispatch)
--FILE--
<?php

class Loader {
public string $data = "loader-data";

public function load(string $class): void {
spl_autoload_unregister([$this, 'load']);
echo $this->data, "\n";
}
}

$obj = new Loader();
spl_autoload_register([$obj, 'load']);
unset($obj);

try {
new NonExistentClass42();
} catch (\Throwable $e) {
echo $e::class, ": ", $e->getMessage(), "\n";
}
?>
--EXPECT--
loader-data
Error: Class "NonExistentClass42" not found
36 changes: 36 additions & 0 deletions ext/spl/tests/autoloading/gh22060_deprecated.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
GH-22060 (Autoloader $this freed by the error handler of its own deprecation notice)
--FILE--
<?php

class Loader {
public string $data = "loader-data";

#[\Deprecated]
public function load(string $class): void {
echo $this->data, "\n";
}
}

$obj = new Loader();
spl_autoload_register([$obj, 'load']);
unset($obj);

set_error_handler(function (int $no, string $str): bool {
echo $str, "\n";
foreach (spl_autoload_functions() as $loader) {
spl_autoload_unregister($loader);
}
return true;
});

try {
new NonExistentClass42();
} catch (\Throwable $e) {
echo $e::class, ": ", $e->getMessage(), "\n";
}
?>
--EXPECT--
Method Loader::load() is deprecated
loader-data
Error: Class "NonExistentClass42" not found
40 changes: 40 additions & 0 deletions ext/sqlite3/tests/gh22122.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--TEST--
GH-22122 (Use-after-free in SQLite3 authorizer when callback releases the authorizer)
--EXTENSIONS--
sqlite3
--FILE--
<?php
$db = new SQLite3(':memory:');

class Auth {
public string $state = "alive";

public function authorize(int $action, ...$args): int {
global $db;
$db->setAuthorizer(null);
echo "method: ", $this->state, "\n";
return SQLite3::OK;
}
}
$auth = new Auth();
$db->setAuthorizer([$auth, 'authorize']);
unset($auth);
$db->exec('SELECT 1');

$capture = "closure-alive";
$closure = function (int $action, ...$args) use (&$capture, $db): int {
$db->setAuthorizer(null);
echo "closure: ", $capture, "\n";
return SQLite3::OK;
};
$db->setAuthorizer($closure);
unset($closure);
$db->exec('SELECT 2');

$db->exec('SELECT 3');
echo "post-disable query ok\n";
?>
--EXPECT--
method: alive
closure: closure-alive
post-disable query ok
3 changes: 0 additions & 3 deletions tests/output/gh20352.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,4 @@ ob_start(new Test, 1);
echo "trigger bug";
?>
--EXPECTF--
%r(Notice: ob_start\(\): Failed to create buffer in [^\r\n]+ on line \d+\r?\n(\r?\n)?)+%r
Notice: ob_start(): Failed to create buffer in %s on line %d

Fatal error: ob_start(): Cannot use output buffering in output buffering display handlers in %s on line %d
Loading