1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
--- php.old/Zend/zend_alloc.c 2006/12/01 19:41:57 1.144.2.3.2.19
+++ php.new/Zend/zend_alloc.c 2006/12/01 20:01:19 1.144.2.3.2.20
@@ -472,6 +472,10 @@
}
} else {
prev = &heap->free_buckets[0];
+ while (prev->next_free_block != &heap->free_buckets[0] &&
+ ZEND_MM_FREE_BLOCK_SIZE(prev->next_free_block) < size) {
+ prev = prev->next_free_block;
+ }
}
next = prev->next_free_block;
mm_block->prev_free_block = prev;
@@ -1098,10 +1102,8 @@
static void *_zend_mm_alloc_int(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
- size_t true_size, best_size = 0x7fffffff;
zend_mm_free_block *p, *end, *best_fit = NULL;
-
- true_size = ZEND_MM_TRUE_SIZE(size);
+ size_t true_size = ZEND_MM_TRUE_SIZE(size);
if (ZEND_MM_SMALL_SIZE(true_size)) {
size_t index = ZEND_MM_BUCKET_INDEX(true_size);
@@ -1154,16 +1156,14 @@
end = &heap->free_buckets[0];
for (p = end->next_free_block; p != end; p = p->next_free_block) {
- size_t s = ZEND_MM_FREE_BLOCK_SIZE(p);
- if (s > true_size) {
- if (s < best_size) { /* better fit */
+ if (ZEND_MM_FREE_BLOCK_SIZE(p) >= true_size) {
+ if (ZEND_MM_IS_FIRST_BLOCK(p) ||
+ !ZEND_MM_IS_FIRST_BLOCK(ZEND_MM_PREV_BLOCK(p)) ||
+ !ZEND_MM_IS_GUARD_BLOCK(ZEND_MM_NEXT_BLOCK(p)) ||
+ p->next_free_block == end) {
best_fit = p;
- best_size = s;
+ goto zend_mm_finished_searching_for_block;
}
- } else if (s == true_size) {
- /* Found "big" free block of exactly the same size */
- best_fit = p;
- goto zend_mm_finished_searching_for_block;
}
}
|
