Changeset 1db44ea7 in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2011-09-25T18:46:45Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

36cb22f

Parents:

dcc44ca1 (diff), f9d8c3a (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) (1 diff)

uspace/lib/c/generic/malloc.c

@@ -873 +873 @@
 void free(const void *addr)
 {
+        if (addr == NULL)
+                return;
+
         futex_down(&malloc_futex);