summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--Zend/zend_alloc.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 1144770d85..579d435c72 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,6 @@ PHP NEWS
- Core:
. Fixed bug #78535 (auto_detect_line_endings value not parsed as bool).
(bugreportuser)
- . Fixed bug #78620 (Out of memory error). (cmb)
- Exif :
. Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7)
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