From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJTSp-0001bk-0L for qemu-devel@nongnu.org; Mon, 18 Aug 2014 16:23:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJTSk-0001ki-IE for qemu-devel@nongnu.org; Mon, 18 Aug 2014 16:23:34 -0400 Date: Mon, 18 Aug 2014 16:23:23 -0400 From: Jeff Cody Message-ID: <20140818202323.GF2627@localhost.localdomain> References: <1408348310-6628-1-git-send-email-zhang.zhanghailiang@huawei.com> <53F1E445.1060301@msgid.tls.msk.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <53F1E445.1060301@msgid.tls.msk.ru> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [Qemu-trivial] [PATCH v7] slirp/misc: Use g_malloc() instead of malloc() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Tokarev Cc: zhanghailiang , qemu-trivial@nongnu.org, jan.kiszka@siemens.com, luonengjun@huawei.com, peter.huangpeng@huawei.com, qemu-devel@nongnu.org On Mon, Aug 18, 2014 at 03:32:21PM +0400, Michael Tokarev wrote: > 18.08.2014 11:51, zhanghailiang =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > > 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. > >=20 > > Signed-off-by: zhanghailiang > > Reviewed-by: Alex Benn=C3=A9e > > --- > > slirp/misc.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > >=20 > > 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, c= har *exec, > > } > > =20 > > tmp_ptr =3D *ex_ptr; > > - *ex_ptr =3D (struct ex_list *)malloc(sizeof(struct ex_list)); > > + *ex_ptr =3D (struct ex_list *)g_malloc(sizeof(struct ex_list)); >=20 > 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. >=20 If you are going to respin anyway, I recommend dropping the superfluous (struct ex_list *) cast here as well. > > (*ex_ptr)->ex_fport =3D port; > > (*ex_ptr)->ex_addr =3D addr; > > (*ex_ptr)->ex_pty =3D do_pty; > > @@ -235,7 +235,7 @@ strdup(str) > > { > > char *bptr; > > =20 > > - bptr =3D (char *)malloc(strlen(str)+1); > > + bptr =3D (char *)g_malloc(strlen(str)+1); > > strcpy(bptr, str); > > =20 > > return bptr; >=20 > Oh. And this one should be removed completely. It is a reimplementati= on > of strdup() for system which lacks it. This code should go, we don't b= uild > on such a system anyway and we always have g_strdup(). There's one mor= e > usage of strdup() in this file, btw. >=20 > I'm sorry for being so picky, and you're already at v7, but heck.. We s= hould > be more active at reviewing patches :) >=20 > Thanks, >=20 > /mjt >=20