Changeset 7d88587 in mainline for uspace/lib/libc/generic/malloc.c

Timestamp:

2009-07-14T08:15:21Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

50cfa6c

Parents:

f450280

Message:

realloc() should really check whether the next block is indeed free.

File:

• uspace/lib/libc/generic/malloc.c (modified) (1 diff)

uspace/lib/libc/generic/malloc.c

@@ -406 +406 @@
                     (heap_block_head_t *) (((void *) head) + head->size);
                 
-                if (((void *) next_head < heap_end)
-                    && (head->size + next_head->size >= real_size)) {
+                if (((void *) next_head < heap_end) &&
+                    (head->size + next_head->size >= real_size) &&
+                    (next_head->free)) {
                         block_check(next_head);
                         block_init(head, head->size + next_head->size, false);