archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Fix func/class name use after free on opcache OOM condition
This commit is contained in:
Nikita Popov 2021-09-14 12:03:22 +02:00
commit ccff3d93c3
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/opcache/zend_accelerator_util_funcs.c
View file

@ -46,8 +46,10 @@ zend_persistent_script* create_persistent_script(void)
void free_persistent_script(zend_persistent_script *persistent_script, int destroy_elements)
{
if (!destroy_elements) {
persistent_script->script.function_table.pDestructor = NULL;
persistent_script->script.class_table.pDestructor = NULL;
/* Both the keys and values have been transferred into the global tables.
* Set nNumUsed=0 to only deallocate the table, but not destroy any elements. */
persistent_script->script.function_table.nNumUsed = 0;
persistent_script->script.class_table.nNumUsed = 0;
} else {
destroy_op_array(&persistent_script->script.main_op_array);
}