Changeset ac2c3f8f in mainline for uspace/lib/c/generic/malloc.c

Timestamp:

2011-09-23T15:41:57Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

6fe0bf8d

Parents:

086290d (diff), 8895d05 (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 with mainline

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);