mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 4/4] tlsf_malloc: return valid pointer for malloc(0)
Date: Mon, 30 Apr 2012 13:32:55 +0200	[thread overview]
Message-ID: <1335785575-14953-5-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1335785575-14953-1-git-send-email-s.hauer@pengutronix.de>

Signed-off-by: Sascha Hauer <s.hauer@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2012-04-30 11:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-30 11:32 misc patches Sascha Hauer
2012-04-30 11:32 ` [PATCH 1/4] edit: Add proper screen size handling Sascha Hauer
2012-04-30 11:32 ` [PATCH 2/4] remove dlmalloc.src Sascha Hauer
2012-04-30 11:32 ` [PATCH 3/4] dhcp: set start time Sascha Hauer
2012-04-30 11:32 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1335785575-14953-5-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox