diff options
| author | Khem Raj <kraj@mvista.com> | 2008-10-11 08:52:58 +0000 |
|---|---|---|
| committer | Khem Raj <kraj@mvista.com> | 2008-10-11 08:52:58 +0000 |
| commit | 6494060312de389feb65ad32bb411fcc64e821b7 (patch) | |
| tree | b2c735bba6b667b8cf056a858dc216c14590c138 /libc/stdlib/malloc/heap_alloc.c | |
| parent | 47b2dbaaac9757496eb9d419e1912250354d30d1 (diff) | |
Fix bug 4994 hangs on read(). I have tested the patch extensibly on ARM/LT.old.
Thank you Chase Douglas for reporting it and for the patch.
Diffstat (limited to 'libc/stdlib/malloc/heap_alloc.c')
| -rw-r--r-- | libc/stdlib/malloc/heap_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/stdlib/malloc/heap_alloc.c b/libc/stdlib/malloc/heap_alloc.c index 9f5fd6c1a..cd52038d3 100644 --- a/libc/stdlib/malloc/heap_alloc.c +++ b/libc/stdlib/malloc/heap_alloc.c @@ -20,7 +20,7 @@ *SIZE is adjusted to reflect the actual amount allocated (which may be greater than requested). */ void * -__heap_alloc (struct heap *heap, size_t *size) +__heap_alloc (struct heap_free_area *heap, size_t *size) { struct heap_free_area *fa; size_t _size = *size; @@ -36,7 +36,7 @@ __heap_alloc (struct heap *heap, size_t *size) HEAP_DEBUG (heap, "before __heap_alloc"); /* Look for a free area that can contain _SIZE bytes. */ - for (fa = heap->free_areas; fa; fa = fa->next) + for (fa = heap; fa; fa = fa->next) if (fa->size >= _size) { /* Found one! */ |