From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFgl8-0001Po-2f for qemu-devel@nongnu.org; Fri, 08 Aug 2014 05:46:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XFgl3-0003u8-8e for qemu-devel@nongnu.org; Fri, 08 Aug 2014 05:46:50 -0400 Received: from static.88-198-71-155.clients.your-server.de ([88.198.71.155]:35075 helo=socrates.bennee.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XFgl3-0003tv-2Q for qemu-devel@nongnu.org; Fri, 08 Aug 2014 05:46:45 -0400 References: <1407489672-12212-1-git-send-email-zhang.zhanghailiang@huawei.com> <1407489672-12212-7-git-send-email-zhang.zhanghailiang@huawei.com> From: Alex =?utf-8?Q?Benn=C3=A9e?= Date: Fri, 08 Aug 2014 10:43:47 +0100 In-reply-to: <1407489672-12212-7-git-send-email-zhang.zhanghailiang@huawei.com> Message-ID: <87mwbfjotv.fsf@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v4 06/10] slirp/misc: check return value of malloc() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: zhanghailiang Cc: kwolf@redhat.com, lkurusa@redhat.com, mst@redhat.com, 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, rth@twiddle.net zhanghailiang writes: > Signed-off-by: zhanghailiang > --- > slirp/misc.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/slirp/misc.c b/slirp/misc.c > index b8eb74c..9b457ad 100644 > --- a/slirp/misc.c > +++ b/slirp/misc.c > @@ -55,6 +55,10 @@ 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)); > + if (*ex_ptr == NULL) { > + fprintf(stderr, "Error: malloc failed\n"); > + return -1; > + } Your indenting has gone a bit weird there. > (*ex_ptr)->ex_fport = port; > (*ex_ptr)->ex_addr = addr; > (*ex_ptr)->ex_pty = do_pty; > @@ -236,8 +240,9 @@ strdup(str) > char *bptr; > > bptr = (char *)malloc(strlen(str)+1); > - strcpy(bptr, str); > - > + if (bptr) { > + strcpy(bptr, str); > + } > return bptr; > } > #endif Again use of g_malloc would remove the need for this. HACKING section 3 says: 3. Low level memory management Use of the malloc/free/realloc/calloc/valloc/memalign/posix_memalign APIs is not allowed in the QEMU codebase. Instead of these routines, use the GLib memory allocation routines g_malloc/g_malloc0/g_new/ g_new0/g_realloc/g_free or QEMU's qemu_memalign/qemu_blockalign/qemu_vfree APIs. Please note that g_malloc will exit on allocation failure, so there is no need to test for failure (as you would have to with malloc). Calling g_malloc with a zero size is valid and will return NULL. -- Alex Bennée