com php-src: abort on memory limit overflow: Zend/zend_alloc .c
| From: | Antony Dovgal | Date: | Wed, 22 Jan 2014 13:31:13 +0000 |
| Subject: | com php-src: abort on memory limit overflow: Zend/zend_alloc .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76622@lists.php.net to get a copy of this message | ||
Commit: 637095d0e1527c2bee72032636d5c48f73d7d69b
Author: Antony Dovgal <tony2001@php.net> Wed, 22 Jan 2014 17:31:13 +0400
Parents: f78a44e353cf11395cb68eb3e5ca87877ac6c67b
Branches: badoo-5.5_mysqlnd
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=637095d0e1527c2bee72032636d5c48f73d7d69b
Log:
abort on memory limit overflow
Changed paths:
M Zend/zend_alloc.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index bf9d000..adb94fe 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -1801,7 +1801,8 @@ static void zend_mm_safe_error(zend_mm_heap *heap,
} else {
heap->overflow = 2;
}
- zend_bailout();
+ /* zend_bailout(); */
+ abort();
}
static zend_mm_free_block *zend_mm_search_large_block(zend_mm_heap *heap, size_t true_size)