From patchwork Mon Nov 7 09:26:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 124023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D5201B6F69 for ; Mon, 7 Nov 2011 20:27:56 +1100 (EST) Received: from localhost ([::1]:52230 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNLUa-0003Ye-3b for incoming@patchwork.ozlabs.org; Mon, 07 Nov 2011 04:27:48 -0500 Received: from eggs.gnu.org ([140.186.70.92]:46100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNLTx-0001Vd-Dg for qemu-devel@nongnu.org; Mon, 07 Nov 2011 04:27:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNLTv-0002BX-P7 for qemu-devel@nongnu.org; Mon, 07 Nov 2011 04:27:09 -0500 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:37800) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNLTv-0002BL-Es for qemu-devel@nongnu.org; Mon, 07 Nov 2011 04:27:07 -0500 Received: from d06nrmr1707.portsmouth.uk.ibm.com (d06nrmr1707.portsmouth.uk.ibm.com [9.149.39.225]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id pA79R6ID001792 for ; Mon, 7 Nov 2011 09:27:06 GMT Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by d06nrmr1707.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pA79R6K52326650 for ; Mon, 7 Nov 2011 09:27:06 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost.localdomain [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pA79R6bK019796 for ; Mon, 7 Nov 2011 02:27:06 -0700 Received: from localhost (dyn-9-174-219-31.manchester-maybrook.uk.ibm.com [9.174.219.31]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pA79R6P5019784; Mon, 7 Nov 2011 02:27:06 -0700 From: Stefan Hajnoczi To: Date: Mon, 7 Nov 2011 09:26:57 +0000 Message-Id: <1320658020-4374-3-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.7.1 In-Reply-To: <1320658020-4374-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1320658020-4374-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 194.196.100.163 Cc: Anthony Liguori , Stefan Hajnoczi , Pavel Borzenkov Subject: [Qemu-devel] [PATCH 2/5] cmd: Fix potential NULL pointer dereference X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Pavel Borzenkov Signed-off-by: Pavel Borzenkov Signed-off-by: Stefan Hajnoczi --- 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; }