From patchwork Mon Oct 31 18:53:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Borzenkov X-Patchwork-Id: 122916 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 E1DC3B6F7F for ; Tue, 1 Nov 2011 05:54:23 +1100 (EST) Received: from localhost ([::1]:53871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RKwzv-0002Ka-VY for incoming@patchwork.ozlabs.org; Mon, 31 Oct 2011 14:54:15 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=+qadV1VkVT4rrpliJNbHCV225dFFYP8qHiBcr+JhGTw=; b=JoAccUjakj/0wa0R2BJMlS8Ii9p1+ydq78ChM94MIGJjNHaFsxJpyT0tafmV8/W0XL BHHwDEPrLOw2i3h6BGdLeBkpLYIVCFzUGBUXlKjK+Pk+z0Dv/kV5HY+VTVIe12VWVsrx 1Dl1Vra6hKF5vWfJuTv0OY6ymrJb+r9PeO+CA= Received: by 10.204.137.9 with SMTP id u9mr6899611bkt.43.1320087243246; Mon, 31 Oct 2011 11:54:03 -0700 (PDT) Received: from localhost.localdomain (ppp83-237-11-79.pppoe.mtu-net.ru. [83.237.11.79]) by mx.google.com with ESMTPS id v6sm10902053bkt.1.2011.10.31.11.54.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 31 Oct 2011 11:54:01 -0700 (PDT) From: Pavel Borzenkov To: qemu-devel@nongnu.org Date: Mon, 31 Oct 2011 22:53:37 +0400 Message-Id: <1320087218-4230-3-git-send-email-pavel.borzenkov@gmail.com> X-Mailer: git-send-email 1.7.7 In-Reply-To: <1320087218-4230-1-git-send-email-pavel.borzenkov@gmail.com> References: <1320087218-4230-1-git-send-email-pavel.borzenkov@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.45 Cc: armbru@redhat.com Subject: [Qemu-devel] [PATCH v2 2/3] 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 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; }