From patchwork Thu Dec 19 10:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 182086 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp314744iln; Thu, 19 Dec 2019 02:56:35 -0800 (PST) X-Google-Smtp-Source: APXvYqw48v15gWfQPamhzuh57Mq0gD5ZbbRWmGcZTn+oLGne11xAXoHL7ewpR2lwjkiyIYL8ZedZ X-Received: by 2002:a05:6214:1150:: with SMTP id b16mr6935951qvt.71.1576752995437; Thu, 19 Dec 2019 02:56:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576752995; cv=none; d=google.com; s=arc-20160816; b=IjmMTEbwJoixiv5UgB5KyLcDOkc+86he7GkAH+y9/F7eSwBFfB3vvNwvCwp6rEF97C EOaVciRHRdUpTz5XwK1msrLPSLL+32Ei8W67PwBdoS279bODJreQ4JTVFtvjIyxqGbUG Zpyl0fB+5Z2DE80MAs3XCajNyFgClbDF3FOikAfhJHSdpv/tpP8CcoZZr4P6gXl96ITb G9IWq8+BWSuDluE4NnzSN6o1jzk0F71bKyNir3t99W6fXRAapEKw/xLC3+147aoFYfkN vlqYYVuCQGmrsbXcxXwia1IdDf2vlpMldg6xfWnF7d5v2wZDzgT6BBuoiFQ7WxgpbiBG NhAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=E6nvW6fexsDWMN+ZoXwp4ZNbLiQ7+yB+XmIDWRZJcu8=; b=OgiPvLAQO22sXlMnw1r9x/WjC9Utis2pZ196zl1p3MHJMELoK/nCfVImMMjvkHTmuW cUnKDvPdDDg/hQuGxqjXyZbPiOP0a+BxemZX+VvdI8H5tXfpcg/LZVuGTkNc+Mq9/e91 juqncT979jr6UhcbYZfi+8lJcpoFizY5tH4yYO+iN5XbjXY9q1AFzhXpreWcEgMoI5JH dWp0CBguVlHy5P7MU8NMKcsMr9b8BxUUiqzALATZCvwT/Suo03wpwAzOphQu2WWBoOFN C1uqODq+bNUpm598f7Fjal/iX6lyblNblQH1GwIr3LhRAUoXB9S6/Q6QVSYNq2HdsD6H kzVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TuTieeeY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d2si293252qtj.154.2019.12.19.02.56.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Dec 2019 02:56:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=TuTieeeY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38864 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtTu-0008VY-Mm for patch@linaro.org; Thu, 19 Dec 2019 05:56:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40014) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtNR-0006pq-52 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihtNP-0000fg-Sc for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:52 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:41088) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihtNP-0000af-JO for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:49:51 -0500 Received: by mail-wr1-x431.google.com with SMTP id c9so5472894wrw.8 for ; Thu, 19 Dec 2019 02:49:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E6nvW6fexsDWMN+ZoXwp4ZNbLiQ7+yB+XmIDWRZJcu8=; b=TuTieeeY7X2UgCrzy2VBnkgGbRR3n+E/SMAGMjPPGsubYnWuu51pI/0G3YP6Y5I7nX S19PZQeorNFIyo8XmJPDuDsAKKgyqPDCP54TWOYVZ/By5Xdx5RWNslTRarKbDP++KxmY jynEZ7zkCIZdjdrDM4WCg7Nvw0o+B4ukc57N5narWgF8YlxNqA90vSRF40Eq3RLVTDF0 BYrQ+OUCNWZiXvkr2zDptem0idI3AdLT7/KENQAHV+DceDlpoiZWTO53k22mES9uVwk/ E7pmuk87BngzP1yZyXHfhPIdLUu9SZMo4ZetBKlTreoRMX5n2EbBXrRUO7WVh0Y/zIKd w2ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E6nvW6fexsDWMN+ZoXwp4ZNbLiQ7+yB+XmIDWRZJcu8=; b=sZMCxSRfz90o9ejVqKWbLd7/7I9VUuOdaD1IJaM1p16b9VmCCQuTtjoQcnFw3P9WZI 9jIqO0MWjoa8iLsrOOKHRf9/lzTD8v+Vk97CLM6g1HhxULE5MSxgzCPuKBeu9EfQ96uw iOBjTHwFarFHrVPglmQWo12GLA0BoalNmnIk2kVbYnccdr+MMemIVAHbvsDsTrHEPhxU 8mQSslpww+Bgz4dFFbWfrx6x1bOCfqxH5Vk1jSD5L0EtU/ijpdqeIuLc1mSG8TC10dy6 lWMFjAHdP6qNYXgyPQfYplHho0oRoDCGqCpb/xbc/fsRHoGuW4lnoyrHC6Y8plG/TVoA XkKw== X-Gm-Message-State: APjAAAWmmpejmS1bTm4MUR6Q8DPYDnq07W8Q+qYKd5mqiQnbh38NrWpV d1VR43uF3DnOWLmN0vnwAyTRKw== X-Received: by 2002:adf:e74a:: with SMTP id c10mr8424770wrn.386.1576752590648; Thu, 19 Dec 2019 02:49:50 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h17sm6193828wrs.18.2019.12.19.02.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 02:49:42 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 749FF1FF9B; Thu, 19 Dec 2019 10:49:35 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 11/25] Fix double free issue in qemu_set_log_filename(). Date: Thu, 19 Dec 2019 10:49:20 +0000 Message-Id: <20191219104934.866-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219104934.866-1-alex.bennee@linaro.org> References: <20191219104934.866-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Robert Foley Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Robert Foley After freeing the logfilename, we set logfilename to NULL, in case of an error which returns without setting logfilename. Signed-off-by: Robert Foley Reviewed-by: Alex Bennée Signed-off-by: Alex Bennée Message-Id: <20191118211528.3221-2-robert.foley@linaro.org> -- 2.20.1 diff --git a/util/log.c b/util/log.c index 1ca13059eef..4316fe74eee 100644 --- a/util/log.c +++ b/util/log.c @@ -113,6 +113,7 @@ void qemu_set_log_filename(const char *filename, Error **errp) { char *pidstr; g_free(logfilename); + logfilename = NULL; pidstr = strstr(filename, "%"); if (pidstr) {