From 6ebfbd15d5fcc0fe2eff3f336d565224bca27c46 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 18 Aug 2005 15:02:10 +0000 Subject: [PATCH] Fixed bug #34156 (memory usage remains elevated after memory limit is reached) --- Zend/zend_alloc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 26b41adf51..287704be1d 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -76,7 +76,8 @@ static long mem_block_end_magic = MEM_BLOCK_END_MAGIC; #define _CHECK_MEMORY_LIMIT(s, rs, file, lineno) { AG(allocated_memory) += rs;\ if (AG(memory_limit) AG(allocated_memory) - rs) { \ + AG(allocated_memory) -= rs; \ + if (EG(in_execution) && AG(memory_limit)+1048576 > AG(allocated_memory)) { \ AG(memory_limit) = AG(allocated_memory) + 1048576; \ if (file) { \ zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", php_mem_limit, file, lineno, s); \ -- 2.40.0