Add additional information of the memory_limit exceeded error messages

Author: TimWolla

Zend/zend_alloc.c

@@ -368,26 +368,17 @@ static ZEND_COLD ZEND_NORETURN void zend_mm_panic(const char *message)
 	abort();
 }
 
-static ZEND_COLD ZEND_NORETURN void zend_mm_safe_error(zend_mm_heap *heap,
-	const char *format,
-	size_t limit,
-#if ZEND_DEBUG
-	const char *filename,
-	uint32_t lineno,
-#endif
-	size_t size)
+static ZEND_COLD ZEND_NORETURN void zend_mm_safe_error(zend_mm_heap *heap, char* format, ...)
 {
+	va_list args;
 
 	heap->overflow = 1;
 	zend_try {
-		zend_error_noreturn(E_ERROR,
-			format,
-			limit,
-#if ZEND_DEBUG
-			filename,
-			lineno,
-#endif
-			size);
+		va_start(args, format);
+		zend_string *message = zend_vstrpprintf(0, format, args);
+		zend_error_noreturn(E_ERROR, "%s", ZSTR_VAL(message));
+		zend_string_release(message);
+		va_end(args);
 	} zend_catch {
 	}  zend_end_try();
 	heap->overflow = 0;
@@ -1009,11 +1000,21 @@ static void *zend_mm_alloc_pages(zend_mm_heap *heap, uint32_t pages_count ZEND_F
 					if (zend_mm_gc(heap)) {
 						goto get_chunk;
 					} else if (heap->overflow == 0) {
-#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, ZEND_MM_CHUNK_SIZE);
-#else
-						zend_mm_safe_error(heap, "Allowed memory size of %zu bytes exhausted (tried to allocate %zu bytes)", heap->limit, ZEND_MM_CHUNK_SIZE);
-#endif
+						zend_mm_safe_error(
+							heap,
+							"Allowed memory size of %zu bytes exhausted by %zu bytes"
+# if ZEND_DEBUG
+							" at %s:%d"
+# endif
+							". Allocated %zu bytes and need to allocate %zu bytes to satisfy a request for %zu bytes",
+
+							heap->limit, (ZEND_MM_CHUNK_SIZE - (heap->limit - heap->real_size)),
+# if ZEND_DEBUG
+							__zend_filename, __zend_lineno,
+# endif
+							heap->real_size, ZEND_MM_CHUNK_SIZE, (ZEND_DEBUG ? size : ZEND_MM_PAGE_SIZE * pages_count)
+						);
+
 						return NULL;
 					}
 				}
@@ -1535,11 +1536,20 @@ static zend_never_inline void *zend_mm_realloc_huge(zend_mm_heap *heap, void *pt
 				if (zend_mm_gc(heap) && new_size - old_size <= heap->limit - heap->real_size) {
 					/* pass */
 				} else if (heap->overflow == 0) {
-#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, (new_size - old_size));
-#else
-					zend_mm_safe_error(heap, "Allowed memory size of %zu bytes exhausted (tried to allocate %zu bytes)", heap->limit, (new_size - old_size));
-#endif
+					zend_mm_safe_error(
+						heap,
+						"Allowed memory size of %zu bytes exhausted by %zu bytes"
+# if ZEND_DEBUG
+						" at %s:%d"
+# endif
+						". Allocated %zu bytes and need to allocate %zu bytes to satisfy a reallocation from %zu to %zu bytes",
+
+						heap->limit, ((new_size - old_size) - (heap->limit - heap->real_size)),
+# if ZEND_DEBUG
+						__zend_filename, __zend_lineno,
+# endif
+						heap->real_size, (new_size - old_size), old_size, new_size
+					);
 					return NULL;
 				}
 			}
@@ -1827,11 +1837,20 @@ static void *zend_mm_alloc_huge(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_D
 		if (zend_mm_gc(heap) && new_size <= heap->limit - heap->real_size) {
 			/* pass */
 		} else if (heap->overflow == 0) {
-#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, new_size);
-#else
-			zend_mm_safe_error(heap, "Allowed memory size of %zu bytes exhausted (tried to allocate %zu bytes)", heap->limit, new_size);
-#endif
+			zend_mm_safe_error(
+				heap,
+				"Allowed memory size of %zu bytes exhausted by %zu bytes"
+# if ZEND_DEBUG
+				" at %s:%d"
+# endif
+				". Allocated %zu bytes and need to allocate %zu bytes",
+
+				heap->limit, (new_size - (heap->limit - heap->real_size)),
+# if ZEND_DEBUG
+				__zend_filename, __zend_lineno,
+# endif
+				heap->real_size, new_size
+			);
 			return NULL;
 		}
 	}
@@ -2823,15 +2842,20 @@ static zend_always_inline zval *tracked_get_size_zv(zend_mm_heap *heap, void *pt
 
 static zend_always_inline void tracked_check_limit(zend_mm_heap *heap, size_t add_size) {
 	if (add_size > heap->limit - heap->size && !heap->overflow) {
-#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, "file", 0, add_size);
-#else
-		zend_mm_safe_error(heap,
-			"Allowed memory size of %zu bytes exhausted (tried to allocate %zu bytes)",
-			heap->limit, add_size);
-#endif
+		zend_mm_safe_error(
+			heap,
+			"Allowed memory size of %zu bytes exhausted by %zu bytes"
+# if ZEND_DEBUG
+			" at %s:%d"
+# endif
+			". Allocated %zu bytes and need to allocate %zu bytes",
+
+			heap->limit, (add_size - (heap->limit - heap->real_size)),
+# if ZEND_DEBUG
+			"file", 0,
+# endif
+			heap->real_size, add_size
+		);
 	}
 }