From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJuIQ-0005kH-C3 for qemu-devel@nongnu.org; Fri, 28 Oct 2011 17:49:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJuIP-0000dU-Dv for qemu-devel@nongnu.org; Fri, 28 Oct 2011 17:49:02 -0400 From: Pavel Borzenkov Date: Sat, 29 Oct 2011 01:48:53 +0400 Message-Id: <1319838533-25405-1-git-send-email-pavel.borzenkov@gmail.com> Subject: [Qemu-devel] [PATCH] cmd: Fix potential NULL pointer dereference List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org Signed-off-by: Pavel Borzenkov --- Note, that almost all code in the file violates CODING STYLE. The changed lines are written wrt CODING STYLE (like commits 7d7d975c and c32d766a). --- cmd.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmd.c b/cmd.c index f77897e..abcf206 100644 --- a/cmd.c +++ b/cmd.c @@ -49,7 +49,7 @@ 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); } @@ -125,12 +125,7 @@ find_command( void add_user_command(char *optarg) { - ncmdline++; - cmdline = realloc(cmdline, sizeof(char*) * (ncmdline)); - if (!cmdline) { - perror("realloc"); - exit(1); - } + cmdline = g_realloc(cmdline, ++ncmdline * sizeof(char *)); cmdline[ncmdline-1] = optarg; } @@ -194,7 +189,7 @@ command_loop(void) doneline(input, v); } if (cmdline) { - free(cmdline); + g_free(cmdline); return; } -- 1.7.0.4