cvs: ZendEngine2 / zend_mm.c
| From: | Ilia Alshanetsky | Date: | Tue, 06 Jan 2004 22:44:40 +0000 |
| Subject: | cvs: ZendEngine2 / zend_mm.c | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2181@lists.php.net to get a copy of this message | ||
iliaa Tue Jan 6 17:44:40 2004 EDT
Modified files:
/ZendEngine2 zend_mm.c
Log:
Check if realloc() succeeds or not. (Noticed by Andrey)
Index: ZendEngine2/zend_mm.c
diff -u ZendEngine2/zend_mm.c:1.26 ZendEngine2/zend_mm.c:1.27
--- ZendEngine2/zend_mm.c:1.26 Tue Oct 14 14:13:55 2003
+++ ZendEngine2/zend_mm.c Tue Jan 6 17:44:40 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_mm.c,v 1.26 2003/10/14 18:13:55 andi Exp $ */
+/* $Id: zend_mm.c,v 1.27 2004/01/06 22:44:40 iliaa Exp $ */
#include "zend.h"
#include "zend_mm.h"
@@ -408,6 +408,9 @@
/* segment size, size of block and size of guard block */
realloc_to_size = ZEND_MM_ALIGNED_SEGMENT_SIZE+true_size+ZEND_MM_ALIGNED_HEADER_SIZE;
segment = realloc(segment, realloc_to_size);
+ if (!segment) {
+ return NULL;
+ }
if (segment != segment_copy) {
if (heap->segments_list == segment_copy) {