Re: [PATCH] xstrdup: don't panic on xstrdup(NULL)

From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] xstrdup: don't panic on xstrdup(NULL)
Date: Mon, 12 Sep 2016 08:16:02 +0200	[thread overview]
Message-ID: <20160912061602.pbmdgl27zw3x5grg@pengutronix.de> (raw)
In-Reply-To: <1473403042-20535-1-git-send-email-u.kleine-koenig@pengutronix.de>

On Fri, Sep 09, 2016 at 08:37:22AM +0200, Uwe Kleine-König wrote:
> Instead return just NULL. This matches the behaviour of kstrdup in the
> kernel and xstrdup in busybox.
> 
> This fixes a panic with CONFIG_CMD_MAGICVAR=y and
> CONFIG_CMD_MAGICVAR_HELP unset in magicvar_add() where description is
> always NULL.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---

Applied, thanks

Sascha

>  lib/xfuncs.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/xfuncs.c b/lib/xfuncs.c
> index aaf078854429..1dc2ea92d84f 100644
> --- a/lib/xfuncs.c
> +++ b/lib/xfuncs.c
> @@ -56,10 +56,15 @@ EXPORT_SYMBOL(xzalloc);
>  
>  char *xstrdup(const char *s)
>  {
> -	char *p = strdup(s);
> +	char *p;
> +
> +	if (!s)
> +		return NULL;
>  
> +	p = strdup(s);
>  	if (!p)
>  		panic("ERROR: out of memory\n");
> +
>  	return p;
>  }
>  EXPORT_SYMBOL(xstrdup);
> -- 
> 2.8.1
> 
> 
> _______________________________________________
> 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