diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-02 19:02:12 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-02 19:02:28 +0200 |
| commit | d295e1dce23cf49774419e7baf29373eabbbed8d (patch) | |
| tree | 5e42580d5be7bdf76a2ec5c6b7716947117bfc02 /Zend/zend_alloc.c | |
| parent | 752a34fb2cc2ae3154471ba8698d7e2fcfa4ae22 (diff) | |
| parent | f2fb37a772908a9331e67f583fddcc4b1b186ccf (diff) | |
| download | php-git-d295e1dce23cf49774419e7baf29373eabbbed8d.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Revert "Fix #78620: Out of memory error"
Diffstat (limited to 'Zend/zend_alloc.c')
| -rw-r--r-- | Zend/zend_alloc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 744203da5e..035e23f1db 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1799,15 +1799,10 @@ static void *zend_mm_alloc_huge(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_D void *ptr; #if ZEND_MM_LIMIT - if (UNEXPECTED(new_size == 0)) { - /* overflow in ZEND_MM_ALIGNED_SIZE_EX */ - goto memory_limit_exhausted; - } if (UNEXPECTED(new_size > heap->limit - heap->real_size)) { if (zend_mm_gc(heap) && new_size <= heap->limit - heap->real_size) { /* pass */ } else if (heap->overflow == 0) { -memory_limit_exhausted: #if ZEND_DEBUG zend_mm_safe_error(heap, "Allowed memory size of %zu bytes exhausted at %s:%d (tried to allocate %zu bytes)", heap->limit, __zend_filename, __zend_lineno, size); #else |