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.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix #81585: cached_chunks are not counted to real_size on shutdown
This commit is contained in:
Christoph M. Becker 2021-12-10 12:25:30 +01:00
commit 2362722dcf
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -9,6 +9,8 @@ PHP NEWS
. Fixed bug #81656 (GCC-11 silently ignores -R). (Michael Wallner) . Fixed bug #81656 (GCC-11 silently ignores -R). (Michael Wallner)
. Fixed bug #81683 (Misleading "access type ... must be public" error message . Fixed bug #81683 (Misleading "access type ... must be public" error message
on final or abstract interface methods). (ilutov) on final or abstract interface methods). (ilutov)
. Fixed bug #81585 (cached_chunks are not counted to real_size on shutdown).
(cmb)
- MBString: - MBString:
. Fixed bug #81693 (mb_check_encoding(7bit) segfaults). (cmb) . Fixed bug #81693 (mb_check_encoding(7bit) segfaults). (cmb)

4
Zend/zend_alloc.c
View file

@ -2304,10 +2304,10 @@ void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
#endif #endif
memset(heap->free_slot, 0, sizeof(heap->free_slot)); memset(heap->free_slot, 0, sizeof(heap->free_slot));
#if ZEND_MM_STAT || ZEND_MM_LIMIT #if ZEND_MM_STAT || ZEND_MM_LIMIT
heap->real_size = ZEND_MM_CHUNK_SIZE; heap->real_size = (heap->cached_chunks_count + 1) * ZEND_MM_CHUNK_SIZE;
#endif #endif
#if ZEND_MM_STAT #if ZEND_MM_STAT
heap->real_peak = ZEND_MM_CHUNK_SIZE; heap->real_peak = (heap->cached_chunks_count + 1) * ZEND_MM_CHUNK_SIZE;
#endif #endif
heap->chunks_count = 1; heap->chunks_count = 1;
heap->peak_chunks_count = 1; heap->peak_chunks_count = 1;