diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-02 19:03:04 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-10-02 19:03:25 +0200 |
| commit | 25081315887ab08c391f9eadf9f9bc8faefc779e (patch) | |
| tree | d1e2eed751387d3a0641b7bc7fb626669357dd23 /Zend/zend_alloc.c | |
| parent | b262b24beb1e2365d821465ab23e563a2e2a8632 (diff) | |
| parent | d295e1dce23cf49774419e7baf29373eabbbed8d (diff) | |
| download | php-git-25081315887ab08c391f9eadf9f9bc8faefc779e.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
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 7dbb8a473e..d3349fe395 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1761,15 +1761,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 |