All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Tokarev <mjt@tls.msk.ru>
To: zhanghailiang <zhang.zhanghailiang@huawei.com>,  qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, jan.kiszka@siemens.com,
	luonengjun@huawei.com, peter.huangpeng@huawei.com
Subject: Re: [Qemu-trivial] [PATCH v7] slirp/misc: Use g_malloc() instead of malloc()
Date: Mon, 18 Aug 2014 15:32:21 +0400	[thread overview]
Message-ID: <53F1E445.1060301@msgid.tls.msk.ru> (raw)
In-Reply-To: <1408348310-6628-1-git-send-email-zhang.zhanghailiang@huawei.com>

18.08.2014 11:51, zhanghailiang пишет:
> Here we don't check the return value of malloc() which may fail.
> Use the g_malloc() instead, which will abort the program when
> there is not enough memory.
> 
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  slirp/misc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/slirp/misc.c b/slirp/misc.c
> index b8eb74c..f7fe497 100644
> --- a/slirp/misc.c
> +++ b/slirp/misc.c
> @@ -54,7 +54,7 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec,
>  	}
>  
>  	tmp_ptr = *ex_ptr;
> -	*ex_ptr = (struct ex_list *)malloc(sizeof(struct ex_list));
> +	*ex_ptr = (struct ex_list *)g_malloc(sizeof(struct ex_list));

There's a convinient macro in glib, g_new(typename, numelts).  Also
there's a less commonly used g_renew() which is like realloc, but it
is not applicable here.

>  	(*ex_ptr)->ex_fport = port;
>  	(*ex_ptr)->ex_addr = addr;
>  	(*ex_ptr)->ex_pty = do_pty;
> @@ -235,7 +235,7 @@ strdup(str)
>  {
>  	char *bptr;
>  
> -	bptr = (char *)malloc(strlen(str)+1);
> +	bptr = (char *)g_malloc(strlen(str)+1);
>  	strcpy(bptr, str);
>  
>  	return bptr;

Oh.  And this one should be removed completely.  It is a reimplementation
of strdup() for system which lacks it.  This code should go, we don't build
on such a system anyway and we always have g_strdup().  There's one more
usage of strdup() in this file, btw.

I'm sorry for being so picky, and you're already at v7, but heck.. We should
be more active at reviewing patches :)

Thanks,

/mjt


WARNING: multiple messages have this Message-ID (diff)
From: Michael Tokarev <mjt@tls.msk.ru>
To: zhanghailiang <zhang.zhanghailiang@huawei.com>, qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, jan.kiszka@siemens.com,
	luonengjun@huawei.com, peter.huangpeng@huawei.com
Subject: Re: [Qemu-devel] [Qemu-trivial] [PATCH v7] slirp/misc: Use g_malloc() instead of malloc()
Date: Mon, 18 Aug 2014 15:32:21 +0400	[thread overview]
Message-ID: <53F1E445.1060301@msgid.tls.msk.ru> (raw)
In-Reply-To: <1408348310-6628-1-git-send-email-zhang.zhanghailiang@huawei.com>

18.08.2014 11:51, zhanghailiang пишет:
> Here we don't check the return value of malloc() which may fail.
> Use the g_malloc() instead, which will abort the program when
> there is not enough memory.
> 
> Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  slirp/misc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/slirp/misc.c b/slirp/misc.c
> index b8eb74c..f7fe497 100644
> --- a/slirp/misc.c
> +++ b/slirp/misc.c
> @@ -54,7 +54,7 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec,
>  	}
>  
>  	tmp_ptr = *ex_ptr;
> -	*ex_ptr = (struct ex_list *)malloc(sizeof(struct ex_list));
> +	*ex_ptr = (struct ex_list *)g_malloc(sizeof(struct ex_list));

There's a convinient macro in glib, g_new(typename, numelts).  Also
there's a less commonly used g_renew() which is like realloc, but it
is not applicable here.

>  	(*ex_ptr)->ex_fport = port;
>  	(*ex_ptr)->ex_addr = addr;
>  	(*ex_ptr)->ex_pty = do_pty;
> @@ -235,7 +235,7 @@ strdup(str)
>  {
>  	char *bptr;
>  
> -	bptr = (char *)malloc(strlen(str)+1);
> +	bptr = (char *)g_malloc(strlen(str)+1);
>  	strcpy(bptr, str);
>  
>  	return bptr;

Oh.  And this one should be removed completely.  It is a reimplementation
of strdup() for system which lacks it.  This code should go, we don't build
on such a system anyway and we always have g_strdup().  There's one more
usage of strdup() in this file, btw.

I'm sorry for being so picky, and you're already at v7, but heck.. We should
be more active at reviewing patches :)

Thanks,

/mjt

  reply	other threads:[~2014-08-18 11:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-18  7:51 [Qemu-trivial] [PATCH v7] slirp/misc: Use g_malloc() instead of malloc() zhanghailiang
2014-08-18  7:51 ` [Qemu-devel] " zhanghailiang
2014-08-18 11:32 ` Michael Tokarev [this message]
2014-08-18 11:32   ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
2014-08-18 20:23   ` [Qemu-trivial] [Qemu-devel] " Jeff Cody
2014-08-18 20:23     ` [Qemu-devel] [Qemu-trivial] " Jeff Cody
2014-08-19  7:30   ` zhanghailiang
2014-08-19  7:30     ` [Qemu-devel] " zhanghailiang
2014-08-19  7:32     ` Michael Tokarev
2014-08-19  7:32       ` [Qemu-devel] " Michael Tokarev

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=53F1E445.1060301@msgid.tls.msk.ru \
    --to=mjt@tls.msk.ru \
    --cc=jan.kiszka@siemens.com \
    --cc=luonengjun@huawei.com \
    --cc=peter.huangpeng@huawei.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=zhang.zhanghailiang@huawei.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.