From patchwork Thu Jan 19 16:35:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9526333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E697E60113 for ; Thu, 19 Jan 2017 16:35:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D93B62851F for ; Thu, 19 Jan 2017 16:35:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CE2DC285B8; Thu, 19 Jan 2017 16:35:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9B9CC2851F for ; Thu, 19 Jan 2017 16:35:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 012E96EA80; Thu, 19 Jan 2017 16:35:44 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDE776EA80 for ; Thu, 19 Jan 2017 16:35:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 2B91826101E From: Robert Foss To: intel-gfx@lists.freedesktop.org, Tomeu Vizoso , Gustavo Padovan Date: Thu, 19 Jan 2017 11:35:04 -0500 Message-Id: <20170119163506.13270-5-robert.foss@collabora.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170119163506.13270-1-robert.foss@collabora.com> References: <20170119163506.13270-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v1 4/6] lib/igt_kms: Set free'd pointer to NULL X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Avoid double free's by setting the free'd pointer to NULL after free. Signed-off-by: Robert Foss --- lib/igt_kms.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 8c10568a..52e1f179 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -1700,6 +1700,7 @@ static void igt_output_fini(igt_output_t *output) { kmstest_free_connector_config(&output->config); free(output->name); + output->name = NULL; } /** @@ -1719,8 +1720,9 @@ void igt_display_fini(igt_display_t *display) for (i = 0; i < display->n_outputs; i++) igt_output_fini(&display->outputs[i]); free(display->outputs); - free(display->pipes); display->outputs = NULL; + free(display->pipes); + display->pipes = NULL; } static void igt_display_refresh(igt_display_t *display)