Fixed incorrect reinitialization

dstogov · dstogov · commit 7c24be8672e0 · 2010-07-14T10:27:08.000Z
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -1115,7 +1115,7 @@ ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_mem_handlers *handlers,
 				mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i];
 			}
 		}
-		mm_heap->rest_buckets[0]->next_free_block = mm_heap->rest_buckets[1]->prev_free_block = ZEND_MM_REST_BUCKET(mm_heap);
+		mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(mm_heap);
 
 		free(heap);
 		heap = mm_heap;

Original file line number	Diff line number	Diff line change
`@@ -1115,7 +1115,7 @@ ZEND_API zend_mm_heap zend_mm_startup_ex(const zend_mm_mem_handlers handlers,`
`1115`	`1115`	`mm_heap->large_free_buckets[i]->parent = &mm_heap->large_free_buckets[i];`
`1116`	`1116`	`}`
`1117`	`1117`	`}`
`1118`		`- mm_heap->rest_buckets[0]->next_free_block = mm_heap->rest_buckets[1]->prev_free_block = ZEND_MM_REST_BUCKET(mm_heap);`
	`1118`	`+ mm_heap->rest_buckets[0] = mm_heap->rest_buckets[1] = ZEND_MM_REST_BUCKET(mm_heap);`
`1119`	`1119`
`1120`	`1120`	`free(heap);`
`1121`	`1121`	`heap = mm_heap;`