Skip to content

Fix double-free of EG(errors)/persistent_script->warnings on persist of already persisted file #19995

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

Closed
wants to merge 2 commits into from
Closed

Fix double-free of EG(errors)/persistent_script->warnings on persist of already persisted file #19995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bab796e
Fix double-free of EG(errors)/persistent_script->warnings on persist …
iluuu1994 Sep 29, 2025
a9a9ec4
Improve accuracy of check
iluuu1994 Sep 30, 2025
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
9 changes: 8 additions & 1 deletion ext/opcache/ZendAccelerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2209,7 +2209,14 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
SHM_PROTECT();
HANDLE_UNBLOCK_INTERRUPTIONS();

zend_emit_recorded_errors();
/* We may have switched to an existing persistent script that was persisted in
* the meantime. Make sure to use its warnings if available. */
if (ZCG(accel_directives).record_warnings) {
EG(record_errors) = false;
zend_emit_recorded_errors_ex(persistent_script->num_warnings, persistent_script->warnings);
} else {
zend_emit_recorded_errors();
}
zend_free_recorded_errors();
} else {

Expand Down
21 changes: 21 additions & 0 deletions ext/opcache/tests/gh19984.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
--TEST--
GH-19984: Double-free of EG(errors)/persistent_script->warnings on persist of already persisted file
--EXTENSIONS--
opcache
pcntl
--INI--
opcache.enable_cli=1
opcache.record_warnings=1
--SKIPIF--
<?php
if (!function_exists('pcntl_fork')) die('skip pcntl_fork() not available');
?>
--FILE--
<?php
$pid = pcntl_fork();
require __DIR__ . '/warning_replay.inc';
?>
--EXPECTF--
Warning: Unsupported declare 'unknown' in %s on line %d

Warning: Unsupported declare 'unknown' in %s on line %d
10 changes: 0 additions & 10 deletions ext/opcache/zend_accelerator_util_funcs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,6 @@ void free_persistent_script(zend_persistent_script *persistent_script, int destr
zend_string_release_ex(persistent_script->script.filename, 0);
}

if (persistent_script->warnings) {
for (uint32_t i = 0; i < persistent_script->num_warnings; i++) {
zend_error_info *info = persistent_script->warnings[i];
zend_string_release(info->filename);
zend_string_release(info->message);
efree(info);
}
efree(persistent_script->warnings);
}

zend_accel_free_delayed_early_binding_list(persistent_script);

efree(persistent_script);
Expand Down