svn: /php/php-src/trunk/Zend/ zend_alloc.c
| From: | Dmitry Stogov | Date: | Mon, 20 Sep 2010 12:12:42 +0000 |
| Subject: | svn: /php/php-src/trunk/Zend/ zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-63532@lists.php.net to get a copy of this message | ||
dmitry Mon, 20 Sep 2010 12:12:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=303619
Log:
Fixed bug #52888 (Zend MM shutdown crash)
Bug: http://bugs.php.net/52888 (Assigned) Zend MM shutdown
crash
Changed paths:
U php/php-src/trunk/Zend/zend_alloc.c
Modified: php/php-src/trunk/Zend/zend_alloc.c
===================================================================
--- php/php-src/trunk/Zend/zend_alloc.c 2010-09-20 11:17:05 UTC (rev 303618)
+++ php/php-src/trunk/Zend/zend_alloc.c 2010-09-20 12:12:42 UTC (rev 303619)
@@ -1649,6 +1649,7 @@
}
} else {
if (segment) {
+#ifndef ZEND_WIN32
if (heap->reserve_size) {
while (segment->next_segment) {
prev = segment;
@@ -1657,13 +1658,16 @@
}
heap->segments_list = segment;
} else {
+#endif
do {
prev = segment;
segment = segment->next_segment;
ZEND_MM_STORAGE_FREE(prev);
} while (segment);
heap->segments_list = NULL;
+#ifndef ZEND_WIN32
}
+#endif
}
if (heap->compact_size &&
heap->real_peak > heap->compact_size) {