Changeset 371bd7d in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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 (moved) (moved from uspace/lib/libc/generic/malloc.c ) (1 diff)

uspace/lib/c/generic/malloc.c

@@ -164 +164 @@
 {
         if (size == 0)
+                return false;
+
+        if ((heap_start + size < heap_start) || (heap_end + size < heap_end))
                 return false;