From patchwork Thu Apr 2 09:52:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 46708 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 32511216D1 for ; Thu, 2 Apr 2015 09:52:22 +0000 (UTC) Received: by layy10 with SMTP id y10sf10549762lay.0 for ; Thu, 02 Apr 2015 02:52:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=I+loLxbsFTDT+5jvQqU81vDcLL6R3yp2T+64my9EmUk=; b=lbSGfAw7JWxc7LGCSQ/XXAUh/0DWU1kBzhYx7WCRmFjwfUCIOWekduUgkQXXeLymg4 IdtVoo6rwij/Nm8BDbvXd6d1o95oRFtWCORuUq1xWQWGYSv/QBOhiFmiH6qLynYZLvrk nIKNInGQkYeuU8ED172f60pQiHKyr2Uh1n+msxtajE/3rrJT5Nl/z/MPTy+jrVfjNM1/ zkHnFVrCUG3N3oOTd8JfFQ6xkNZ2en4AiehYdxXNGKt3+J6enuWaCeNFIF7y6IgW+fGr VorPS5JGJLdqSd+N3d5p+PjQ/1G9XTyfH7K/xZZqAKttLHk/QUOBhHFEZ7wohQLixF5G cfsQ== X-Gm-Message-State: ALoCoQk+VovBHJlU9QrpVrsGGLyvQ0osxVhFo78ydcNNYD/n3qU4Cq0hGAT4Vdksw2KT7dGf8n2u X-Received: by 10.194.11.70 with SMTP id o6mr12023285wjb.6.1427968341014; Thu, 02 Apr 2015 02:52:21 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.120.199 with SMTP id le7ls210960lab.89.gmail; Thu, 02 Apr 2015 02:52:20 -0700 (PDT) X-Received: by 10.152.203.201 with SMTP id ks9mr25702275lac.49.1427968340752; Thu, 02 Apr 2015 02:52:20 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id ms7si3830141lbb.51.2015.04.02.02.52.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Apr 2015 02:52:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lboc7 with SMTP id c7so55464502lbo.1 for ; Thu, 02 Apr 2015 02:52:20 -0700 (PDT) X-Received: by 10.152.234.169 with SMTP id uf9mr1576075lac.88.1427968340568; Thu, 02 Apr 2015 02:52:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.57.201 with SMTP id k9csp1221415lbq; Thu, 2 Apr 2015 02:52:20 -0700 (PDT) X-Received: by 10.195.11.73 with SMTP id eg9mr89942747wjd.62.1427968339891; Thu, 02 Apr 2015 02:52:19 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id n10si34444984wiw.97.2015.04.02.02.52.19 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 02 Apr 2015 02:52:19 -0700 (PDT) Received-SPF: none (google.com: pm215@archaic.org.uk does not designate permitted sender hosts) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1YdbnK-0003mm-NI; Thu, 02 Apr 2015 10:52:14 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Shannon Zhao , Gonglei , Stefan Weil , Michael Tokarev Subject: [PATCH for-2.3] hw/arm/vexpress: Don't double-free flash filename Date: Thu, 2 Apr 2015 10:52:14 +0100 Message-Id: <1427968334-14527-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commits 6e05a12f8f7f and db25a1581 both attempt to fix the same "failed to free memory containing flash filename" bug, with the effect that when they were both applied we ended up freeing the memory twice. Delete the spurious extra free. Signed-off-by: Peter Maydell --- Shannon's patch fixes the virt.c board; I checked the other boards touched by 6e05a12f8f7f and they don't have the problem (either due to no conflicting patch or because the g_free() calls were in the same place and the merge combined them.) hw/arm/vexpress.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index dd04527..54dd967 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -583,7 +583,6 @@ static void vexpress_common_init(MachineState *machine) error_report("Could not load ROM image '%s'", bios_name); exit(1); } - g_free(fn); } /* Motherboard peripherals: the wiring is the same but the