Minor fix found in heap.c #75
Conversation
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com> Change-Id: I02fcf82131876e402f6645ff36ff06425de54744
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com> Change-Id: I78213feec0e698533ed2234758d82f3c2bf55d67
| @@ -76,7 +76,7 @@ static void *heap_extend(const int incr) | |||
| static char *bounds_p = block_o_bytes + sizeof(block_o_bytes); | |||
| static char *block_p = block_o_bytes; | |||
|
|
|||
| if (block_p + incr >= bounds_p) { | |||
There was a problem hiding this comment.
I think this is right. If we use up to bounds_p then there was enough space.
There was a problem hiding this comment.
No, here is an extreme example suppose INTERNAL_MEMORY_SPACE and incr both are 4KB. Then the first call heap_extend will fail due to block_p + 4KB == bounds_p even there is still 4KB free memory in the pool.
There was a problem hiding this comment.
But if block_p + 4096 is == to bounds_p then it 's going to return SBRK_ERROR right? Am I missing something? I think it should return SBRK_ERROR if it is > bounds_p only.
There was a problem hiding this comment.
Yes, my change do what you describe:
The old condition(block_p + incr >= bounds_p) return SBRK_ERROR, the new condtition(block_p + incr > bounds_p) return block_p in this case.
There was a problem hiding this comment.
Oh for goodness sake. Sorry. I see it now.
| @@ -214,6 +214,7 @@ void *_dmalloc_heap_alloc(const unsigned int size) | |||
| /* shift the heap a bit to account for non block alignment */ | |||
| heap_diff = heap_extend(diff_size); | |||
| if (heap_diff == SBRK_ERROR) { | |||
| heap_release(heap_new, size); | |||
Fix heap_extend ignore the last block in INTERNAL_MEMORY_SPACE case
Fix the memory leak in case heap_extend return fail