Changeset 00aece0 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2012-02-18T16:47:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4449c6c

Parents:

bd5f3b7 (diff), f943dd3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/lib/c/generic/malloc.c

@@ -283 +283 @@
 static bool area_create(size_t size)
 {
-        void *start = as_get_mappable_page(size);
-        if (start == NULL)
-                return false;
-        
-        /* Align the heap area on page boundary */
-        void *astart = (void *) ALIGN_UP((uintptr_t) start, PAGE_SIZE);
+        /* Align the heap area size on page boundary */
         size_t asize = ALIGN_UP(size, PAGE_SIZE);
-        
-        astart = as_area_create(astart, asize, AS_AREA_WRITE | AS_AREA_READ);
+        void *astart = as_area_create((void *) -1, asize,
+            AS_AREA_WRITE | AS_AREA_READ);
         if (astart == (void *) -1)
                 return false;
@@ -873 +868 @@
 void free(const void *addr)
 {
+        if (addr == NULL)
+                return;
+
         futex_down(&malloc_futex);