From: Zeev Suraski <zeev@php.net>
Date: Sat, 19 Aug 2000 16:35:02 +0000 (+0000)
Subject: Fix memory_limit
X-Git-Tag: php-4.0.2RC1~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07b5d74022c5471c096b73a708a088fcd975efbd;p=php

Fix memory_limit
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index b5025414a7..f33aee46d8 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -57,11 +57,18 @@ ZEND_API zend_alloc_globals alloc_globals;
 
 #define _CHECK_MEMORY_LIMIT(s, rs, file, lineno) { AG(allocated_memory) += rs;\
 								if (AG(memory_limit)<AG(allocated_memory)) {\
-									if (!file) { \
-										zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", AG(memory_limit),s); \
-									} else { \
-										zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", AG(memory_limit), file, lineno, s); \
-									} \
+									if ((AG(memory_limit)+1048576)<AG(allocated_memory)) { \
+										/* failed to handle this gracefully, exit() */ \
+										exit(1);	\
+									}	\
+									if (!AG(memory_exhausted)) {	\
+										if (!file) { \
+											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", AG(memory_limit),s); \
+										} else { \
+											zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", AG(memory_limit), file, lineno, s); \
+										} \
+										AG(memory_exhausted)=1;	\
+									}	\
 								} \
 							}
 # endif
@@ -435,6 +442,7 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 				}
 			}
 #endif
+			AG(allocated_memory) -= t->size;
 			p = t->pNext;
 			REMOVE_POINTER_FROM_LIST(t);
 			free(t);
@@ -451,6 +459,7 @@ ZEND_API void shutdown_memory_manager(int silent, int clean_cache)
 			}
 		}
 	}
+	AG(memory_exhausted)=0;
 
 #if (ZEND_DEBUG)
 	do {