mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Alexander Shiyan <shc_work@mail.ru>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] calloc: Fix possible memory leak
Date: Tue, 22 Oct 2013 08:52:11 +0200	[thread overview]
Message-ID: <20131022065210.GH30088@pengutronix.de> (raw)
In-Reply-To: <1382377705-15040-1-git-send-email-shc_work@mail.ru>

On Mon, Oct 21, 2013 at 09:48:23PM +0400, Alexander Shiyan wrote:
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>

Applied all, thanks

Sascha

> ---
>  common/dlmalloc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/common/dlmalloc.c b/common/dlmalloc.c
> index 7ad368e..b4341fe 100644
> --- a/common/dlmalloc.c
> +++ b/common/dlmalloc.c
> @@ -1750,11 +1750,11 @@ void *calloc(size_t n, size_t elem_size)
>  	mchunkptr oldtop = top;
>  	INTERNAL_SIZE_T oldtopsize = chunksize(top);
>  
> -	void *mem = malloc(sz);
> -
>  	if ((long)n < 0)
>  		return NULL;
>  
> +	void *mem = malloc(sz);
> +
>  	if (!mem)
>  		return NULL;
>  	else {
> -- 
> 1.8.1.5
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

      parent reply	other threads:[~2013-10-22  6:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-21 17:48 Alexander Shiyan
2013-10-21 17:48 ` [PATCH 2/3] gadget: at91: Fix uninitialized variable Alexander Shiyan
2013-10-21 17:48 ` [PATCH 3/3] ubifs: Remove redundant assignment Alexander Shiyan
2013-10-22  6:52 ` 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=20131022065210.GH30088@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=shc_work@mail.ru \
    /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