php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #79252

Browse Source
This commit is contained in:
Nikita Popov
2020-02-28 12:47:56 +01:00
parent 5b82fd491a
commit 30ee3f48d4
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -56,6 +56,10 @@ PHP NEWS
. Fixed bug #79315 (ZipArchive::addFile doesn't honor start/length
parameters). (Remi)
- Opcache:
. Fixed bug #79252 (preloading causes php-fpm to segfault during exit).
(Nikita)
20 Feb 2020, PHP 7.4.3
- Core:

2
ext/opcache/ZendAccelerator.c
View File

@@ -4233,9 +4233,11 @@ static void preload_load(void)
EG(persistent_classes_count) = EG(class_table)->nNumUsed;
}
if (CG(map_ptr_last) != ZCSG(map_ptr_last)) {
size_t old_map_ptr_last = CG(map_ptr_last);
CG(map_ptr_last) = ZCSG(map_ptr_last);
CG(map_ptr_size) = ZEND_MM_ALIGNED_SIZE_EX(CG(map_ptr_last) + 1, 4096);
CG(map_ptr_base) = perealloc(CG(map_ptr_base), CG(map_ptr_size) * sizeof(void*), 1);
memset(CG(map_ptr_base) + old_map_ptr_last, 0, (CG(map_ptr_last) - old_map_ptr_last) * sizeof(void *));
}
}