Skip to content

Commit 6427c4b

Browse files
committed
Merge branch 'PHP-8.0' into PHP-8.1
* PHP-8.0: Fix GH-9361: Segmentation fault on script exit
2 parents 3e0f144 + bb34121 commit 6427c4b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ PHP NEWS
55
- Core:
66
. Fixed bug GH-9323 (Crash in ZEND_RETURN/GC/zend_call_function)
77
(Tim Starling)
8+
. Fixed bug GH-9361 (Segmentation fault on script exit #9379). (cmb,
9+
Christian Schneider)
810

911
- DOM:
1012
. Fixed bug #79451 (DOMDocument->replaceChild on doctype causes double free).

Zend/zend_alloc_sizes.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#ifndef ZEND_ALLOC_SIZES_H
2020
#define ZEND_ALLOC_SIZES_H
2121

22-
#define ZEND_MM_CHUNK_SIZE (2 * 1024 * 1024) /* 2 MB */
22+
#define ZEND_MM_CHUNK_SIZE ((size_t) (2 * 1024 * 1024)) /* 2 MB */
2323
#define ZEND_MM_PAGE_SIZE (4 * 1024) /* 4 KB */
2424
#define ZEND_MM_PAGES (ZEND_MM_CHUNK_SIZE / ZEND_MM_PAGE_SIZE) /* 512 */
2525
#define ZEND_MM_FIRST_PAGE (1)

0 commit comments

Comments
 (0)