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

Timestamp:

2009-07-13T21:24:30Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

7d88587

Parents:

44539b4c

Message:

Fix alignment errors in realloc().

File:

• uspace/lib/libc/generic/malloc.c (modified) (2 diffs)

uspace/lib/libc/generic/malloc.c

@@ -385 +385 @@
         
         void *ptr = NULL;
-        size_t real_size = GROSS_SIZE(size);
+        size_t real_size = GROSS_SIZE(ALIGN_UP(size, BASE_ALIGN));
         size_t orig_size = head->size;
         
@@ -410 +410 @@
                         block_check(next_head);
                         block_init(head, head->size + next_head->size, false);
-                        split_mark(head, size);
+                        split_mark(head, ALIGN_UP(size, BASE_ALIGN));
                         
                         ptr = ((void *) head) + sizeof(heap_block_head_t);