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

Merge branch 'PHP-8.1'

Browse source 
* PHP-8.1:
  Fixed a crash becaeuse of race condition in inheritance cache
This commit is contained in:
Dmitry Stogov 2021-11-18 14:22:39 +03:00
commit 0e1c7243f6
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/opcache/ZendAccelerator.c
View file

@ -2421,11 +2421,12 @@ static zend_class_entry* zend_accel_inheritance_cache_add(zend_class_entry *ce,
}
entry->ce = new_ce = zend_persist_class_entry(ce);
zend_update_parent_ce(new_ce);
entry->next = proto->inheritance_cache;
proto->inheritance_cache = entry;
entry->num_warnings = EG(num_errors);
entry->warnings = zend_persist_warnings(EG(num_errors), EG(errors));
entry->next = proto->inheritance_cache;
proto->inheritance_cache = entry;
EG(num_errors) = 0;
EG(errors) = NULL;