From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1XJFxO-0007bw-5f for mharc-qemu-trivial@gnu.org; Mon, 18 Aug 2014 01:58:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJFxH-0007Q7-Bd for qemu-trivial@nongnu.org; Mon, 18 Aug 2014 01:58:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJFxC-00060c-U2 for qemu-trivial@nongnu.org; Mon, 18 Aug 2014 01:58:07 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:12153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJFx3-0005yj-8O; Mon, 18 Aug 2014 01:57:53 -0400 Received: from 172.24.2.119 (EHLO szxeml421-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id ATF07605; Mon, 18 Aug 2014 13:57:08 +0800 (CST) Received: from [127.0.0.1] (10.177.22.69) by szxeml421-hub.china.huawei.com (10.82.67.160) with Microsoft SMTP Server id 14.3.158.1; Mon, 18 Aug 2014 13:56:57 +0800 Message-ID: <53F195AA.2090503@huawei.com> Date: Mon, 18 Aug 2014 13:56:58 +0800 From: zhanghailiang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:11.0) Gecko/20120327 Thunderbird/11.0.1 MIME-Version: 1.0 To: "Michael S. Tsirkin" References: <1408001361-13580-1-git-send-email-zhang.zhanghailiang@huawei.com> <1408001361-13580-7-git-send-email-zhang.zhanghailiang@huawei.com> <20140814103137.GF31346@redhat.com> In-Reply-To: <20140814103137.GF31346@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.177.22.69] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020208.53F195B8.00ED,ss=1,re=0.000,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2011-05-27 18:58:46 X-Mirapoint-Loop-Id: e31a8c311c17a0ca5b944f27cbac57f7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: kwolf@redhat.com, lkurusa@redhat.com, qemu-trivial@nongnu.org, jan.kiszka@siemens.com, riku.voipio@iki.fi, mjt@tls.msk.ru, qemu-devel@nongnu.org, lcapitulino@redhat.com, stefanha@redhat.com, luonengjun@huawei.com, pbonzini@redhat.com, peter.huangpeng@huawei.com, alex.bennee@linaro.org, rth@twiddle.net Subject: Re: [Qemu-trivial] [PATCH v6 06/10] slirp/misc: Use g_malloc() instead of malloc() X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2014 05:58:11 -0000 On 2014/8/14 18:31, Michael S. Tsirkin wrote: > On Thu, Aug 14, 2014 at 03:29:17PM +0800, zhanghailiang wrote: >> 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 >> Reviewed-by: Alex Bennée > > OK, but then we need to find and replace free calls > as well. > Hmm, actually, i can't find any places that free the *ex_ptr and the ptr allocated by strdup, so i think here, it does not need to call g_free for them, may be they should be exist in all qemu's lifecycle, Thanks, zhanghailiang >> --- >> 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)); >> (*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; >> -- >> 1.7.12.4 >> > > . > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33259) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJFx8-0007E5-Cc for qemu-devel@nongnu.org; Mon, 18 Aug 2014 01:58:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJFx4-0005zE-2G for qemu-devel@nongnu.org; Mon, 18 Aug 2014 01:57:58 -0400 Message-ID: <53F195AA.2090503@huawei.com> Date: Mon, 18 Aug 2014 13:56:58 +0800 From: zhanghailiang MIME-Version: 1.0 References: <1408001361-13580-1-git-send-email-zhang.zhanghailiang@huawei.com> <1408001361-13580-7-git-send-email-zhang.zhanghailiang@huawei.com> <20140814103137.GF31346@redhat.com> In-Reply-To: <20140814103137.GF31346@redhat.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v6 06/10] slirp/misc: Use g_malloc() instead of malloc() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: kwolf@redhat.com, lkurusa@redhat.com, qemu-trivial@nongnu.org, jan.kiszka@siemens.com, riku.voipio@iki.fi, mjt@tls.msk.ru, qemu-devel@nongnu.org, lcapitulino@redhat.com, stefanha@redhat.com, luonengjun@huawei.com, pbonzini@redhat.com, peter.huangpeng@huawei.com, alex.bennee@linaro.org, rth@twiddle.net On 2014/8/14 18:31, Michael S. Tsirkin wrote: > On Thu, Aug 14, 2014 at 03:29:17PM +0800, zhanghailiang wrote: >> 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 >> Reviewed-by: Alex Bennée > > OK, but then we need to find and replace free calls > as well. > Hmm, actually, i can't find any places that free the *ex_ptr and the ptr allocated by strdup, so i think here, it does not need to call g_free for them, may be they should be exist in all qemu's lifecycle, Thanks, zhanghailiang >> --- >> 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)); >> (*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; >> -- >> 1.7.12.4 >> > > . >