php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 17:52:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Fixed bug #79128
This commit is contained in:
Nikita Popov
2020-01-24 16:20:30 +01:00
parent 98bfad738a 3291891408
commit ebd00c5b65
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ext/opcache/ZendAccelerator.c
View File

@@ -4270,19 +4270,24 @@ static zend_persistent_script* preload_script_in_shared_memory(zend_persistent_s
static void preload_load(void)
{
/* Load into process tables */
if (zend_hash_num_elements(&ZCSG(preload_script)->script.function_table)) {
Bucket *p = ZCSG(preload_script)->script.function_table.arData;
Bucket *end = p + ZCSG(preload_script)->script.function_table.nNumUsed;
zend_script *script = &ZCSG(preload_script)->script;
if (zend_hash_num_elements(&script->function_table)) {
Bucket *p = script->function_table.arData;
Bucket *end = p + script->function_table.nNumUsed;
zend_hash_extend(CG(function_table),
CG(function_table)->nNumUsed + script->function_table.nNumUsed, 0);
for (; p != end; p++) {
_zend_hash_append_ptr_ex(CG(function_table), p->key, Z_PTR(p->val), 1);
}
}
if (zend_hash_num_elements(&ZCSG(preload_script)->script.class_table)) {
Bucket *p = ZCSG(preload_script)->script.class_table.arData;
Bucket *end = p + ZCSG(preload_script)->script.class_table.nNumUsed;
if (zend_hash_num_elements(&script->class_table)) {
Bucket *p = script->class_table.arData;
Bucket *end = p + script->class_table.nNumUsed;
zend_hash_extend(CG(class_table),
CG(class_table)->nNumUsed + script->class_table.nNumUsed, 0);
for (; p != end; p++) {
_zend_hash_append_ex(CG(class_table), p->key, &p->val, 1);
}