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

Timestamp:

2010-02-19T17:16:46Z (15 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

617652f

Parents:

b86d436 (diff), f41aa81 (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:

Synchronizing with head (which has just been synchronized with this branch).

File:

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

uspace/lib/libc/generic/malloc.c

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