diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-04 09:09:25 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-04 09:09:39 +0200 |
| commit | cf183a5e2cbf2db5c0e474b31b5e56a00a997ea9 (patch) | |
| tree | f9245a512402d00173a9a4d6214a63725e20b563 /Zend/zend_alloc.c | |
| parent | f45eb353d1fe1bf74c92bec88b7e1e1ea3604345 (diff) | |
| parent | abaf9a76dc933f4d1f2ff3591ced81d4d6dcb652 (diff) | |
| download | php-git-cf183a5e2cbf2db5c0e474b31b5e56a00a997ea9.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78620: Out of memory error
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 035e23f1db..0ccc004e14 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1792,12 +1792,17 @@ static void *zend_mm_alloc_huge(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_D * We allocate them with 2MB size granularity, to avoid many * reallocations when they are extended by small pieces */ - size_t new_size = ZEND_MM_ALIGNED_SIZE_EX(size, MAX(REAL_PAGE_SIZE, ZEND_MM_CHUNK_SIZE)); + size_t alignment = MAX(REAL_PAGE_SIZE, ZEND_MM_CHUNK_SIZE); #else - size_t new_size = ZEND_MM_ALIGNED_SIZE_EX(size, REAL_PAGE_SIZE); + size_t alignment = REAL_PAGE_SIZE; #endif + size_t new_size = ZEND_MM_ALIGNED_SIZE_EX(size, alignment); void *ptr; + if (UNEXPECTED(new_size < size)) { + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu + %zu)", size, alignment); + } + #if ZEND_MM_LIMIT if (UNEXPECTED(new_size > heap->limit - heap->real_size)) { if (zend_mm_gc(heap) && new_size <= heap->limit - heap->real_size) { |