From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:58436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKwzm-000288-0M for qemu-devel@nongnu.org; Mon, 31 Oct 2011 14:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RKwzk-0007MD-4L for qemu-devel@nongnu.org; Mon, 31 Oct 2011 14:54:05 -0400 Received: from mail-bw0-f45.google.com ([209.85.214.45]:64042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKwzj-0007KK-PM for qemu-devel@nongnu.org; Mon, 31 Oct 2011 14:54:04 -0400 Received: by mail-bw0-f45.google.com with SMTP id zu5so1138677bkb.4 for ; Mon, 31 Oct 2011 11:54:03 -0700 (PDT) From: Pavel Borzenkov Date: Mon, 31 Oct 2011 22:53:37 +0400 Message-Id: <1320087218-4230-3-git-send-email-pavel.borzenkov@gmail.com> In-Reply-To: <1320087218-4230-1-git-send-email-pavel.borzenkov@gmail.com> References: <1320087218-4230-1-git-send-email-pavel.borzenkov@gmail.com> Subject: [Qemu-devel] [PATCH v2 2/3] cmd: Fix potential NULL pointer dereference List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com Signed-off-by: Pavel Borzenkov --- cmd.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmd.c b/cmd.c index a6e3ef4..75415d8 100644 --- a/cmd.c +++ b/cmd.c @@ -47,7 +47,7 @@ compare(const void *a, const void *b) void add_command(const cmdinfo_t *ci) { - cmdtab = realloc((void *)cmdtab, ++ncmds * sizeof(*cmdtab)); + cmdtab = g_realloc((void *)cmdtab, ++ncmds * sizeof(*cmdtab)); cmdtab[ncmds - 1] = *ci; qsort(cmdtab, ncmds, sizeof(*cmdtab), compare); } @@ -122,12 +122,7 @@ find_command( void add_user_command(char *optarg) { - ncmdline++; - cmdline = realloc(cmdline, ncmdline * sizeof(char *)); - if (!cmdline) { - perror("realloc"); - exit(1); - } + cmdline = g_realloc(cmdline, ++ncmdline * sizeof(char *)); cmdline[ncmdline-1] = optarg; } @@ -190,7 +185,7 @@ void command_loop(void) doneline(input, v); } if (cmdline) { - free(cmdline); + g_free(cmdline); return; } -- 1.7.0.4