[PATCH 4/4] tlsf_malloc: return valid pointer for malloc(0)
Sascha Hauer
s.hauer at pengutronix.de
Mon Apr 30 07:32:55 EDT 2012
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
common/tlsf_malloc.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/common/tlsf_malloc.c b/common/tlsf_malloc.c
index 2fe443b..8143d66 100644
--- a/common/tlsf_malloc.c
+++ b/common/tlsf_malloc.c
@@ -33,6 +33,13 @@ extern tlsf_pool tlsf_mem_pool;
void *malloc(size_t bytes)
{
+ /*
+ * tlsf_malloc returns NULL for zero bytes, we instead want
+ * to have a valid pointer.
+ */
+ if (!bytes)
+ bytes = 1;
+
return tlsf_malloc(tlsf_mem_pool, bytes);
}
EXPORT_SYMBOL(malloc);
--
1.7.10
More information about the barebox
mailing list