Skip to content

fix(fpm): Fix FPM test harness object leaks reported under ASan and Valgrind. #23494

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
zeriyoshi wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −6
Open

fix(fpm): Fix FPM test harness object leaks reported under ASan and Valgrind. #23494

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
12 changes: 7 additions & 5 deletions sapi/fpm/tests/response.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ namespace FPM;
abstract class BaseResponse
{
/**
* Tester instance
* @var Tester
* Tester instance. Held weakly so that responses do not form a reference
* cycle with the tester, which would keep both alive until the executor
* object store shutdown and get reported as a leak by ASAN/Valgrind.
* @var \WeakReference<Tester>
*/
private Tester $tester;
private \WeakReference $tester;

/**
* @var bool
Expand All @@ -20,7 +22,7 @@ abstract class BaseResponse
*/
public function __construct(Tester $tester)
{
$this->tester = $tester;
$this->tester = \WeakReference::create($tester);
}

/**
Expand Down Expand Up @@ -50,7 +52,7 @@ abstract class BaseResponse
}
echo $errorMessage;

$this->tester->printLogs();
$this->tester->get()?->printLogs();

return false;
}
Expand Down
2 changes: 1 addition & 1 deletion sapi/fpm/tests/tester.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ class Tester

$this->masterProcess = proc_open($cmd, $desc, $pipes, null, $envVars);
register_shutdown_function(
function ($masterProcess) use ($configFile) {
static function ($masterProcess) use ($configFile) {
@unlink($configFile);
if (is_resource($masterProcess)) {
@proc_terminate($masterProcess);
Expand Down
Loading