From nobody Tue Jan 14 22:47:57 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1513654177256435.0008662181489; Mon, 18 Dec 2017 19:29:37 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 174832035B2EF; Mon, 18 Dec 2017 19:24:45 -0800 (PST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 2AD772035BA2E for ; Mon, 18 Dec 2017 19:24:41 -0800 (PST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Dec 2017 19:29:27 -0800 Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.10]) by fmsmga006.fm.intel.com with ESMTP; 18 Dec 2017 19:29:26 -0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=hao.a.wu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,424,1508828400"; d="scan'208";a="188196710" From: Hao Wu To: edk2-devel@lists.01.org Date: Tue, 19 Dec 2017 11:29:01 +0800 Message-Id: <20171219032912.14404-7-hao.a.wu@intel.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20171219032912.14404-1-hao.a.wu@intel.com> References: <20171219032912.14404-1-hao.a.wu@intel.com> Subject: [edk2] [PATCH 06/17] BaseTools/GenFv: Add check to ensure the file handle status is correct X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hao Wu , Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add an extra NULL check for the file handle to ensure that its status is correct. Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu --- BaseTools/Source/C/GenFv/GenFv.c | 38 ++++++++++++++++++++----------------= -- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/BaseTools/Source/C/GenFv/GenFv.c b/BaseTools/Source/C/GenFv/Ge= nFv.c index 4de24b9f7e..be31840310 100644 --- a/BaseTools/Source/C/GenFv/GenFv.c +++ b/BaseTools/Source/C/GenFv/GenFv.c @@ -4,7 +4,7 @@ can be found in the Tiano Firmware Volume Generation Utility=20 Specification, review draft. =20 -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials =20 are licensed and made available under the terms and conditions of the BSD = License =20 which accompanies this distribution. The full text of the license may be = found at =20 @@ -607,23 +607,25 @@ Returns: return STATUS_ERROR; } } - fprintf (FpFile, "Capsule %s Image Header Information\n", InfFileName); - fprintf (FpFile, " GUID %08X-%04X-%04X-%02X%02X-%02X= %02X%02X%02X%02X%02X\n",=20 - (unsigned) CapsuleHeader->CapsuleGuid.Data1, - (unsigned) CapsuleHeader->CapsuleGuid.Data2, - (unsigned) CapsuleHeader->CapsuleGuid.Data3, - (unsigned) CapsuleHeader->CapsuleGuid.Data4[0], - (unsigned) CapsuleHeader->CapsuleGuid.Data4[1], - (unsigned) CapsuleHeader->CapsuleGuid.Data4[2], - (unsigned) CapsuleHeader->CapsuleGuid.Data4[3], - (unsigned) CapsuleHeader->CapsuleGuid.Data4[4], - (unsigned) CapsuleHeader->CapsuleGuid.Data4[5], - (unsigned) CapsuleHeader->CapsuleGuid.Data4[6], - (unsigned) CapsuleHeader->CapsuleGuid.Data4[7]); - fprintf (FpFile, " Header size 0x%08X\n", (unsigned) Capsul= eHeader->HeaderSize); - fprintf (FpFile, " Flags 0x%08X\n", (unsigned) Capsul= eHeader->Flags); - fprintf (FpFile, " Capsule image size 0x%08X\n", (unsigned) Capsul= eHeader->CapsuleImageSize); - fclose (FpFile); + if (FpFile !=3D NULL) { + fprintf (FpFile, "Capsule %s Image Header Information\n", InfFileNam= e); + fprintf (FpFile, " GUID %08X-%04X-%04X-%02X%02X-%0= 2X%02X%02X%02X%02X%02X\n", + (unsigned) CapsuleHeader->CapsuleGuid.Data1, + (unsigned) CapsuleHeader->CapsuleGuid.Data2, + (unsigned) CapsuleHeader->CapsuleGuid.Data3, + (unsigned) CapsuleHeader->CapsuleGuid.Data4[0], + (unsigned) CapsuleHeader->CapsuleGuid.Data4[1], + (unsigned) CapsuleHeader->CapsuleGuid.Data4[2], + (unsigned) CapsuleHeader->CapsuleGuid.Data4[3], + (unsigned) CapsuleHeader->CapsuleGuid.Data4[4], + (unsigned) CapsuleHeader->CapsuleGuid.Data4[5], + (unsigned) CapsuleHeader->CapsuleGuid.Data4[6], + (unsigned) CapsuleHeader->CapsuleGuid.Data4[7]); + fprintf (FpFile, " Header size 0x%08X\n", (unsigned) Caps= uleHeader->HeaderSize); + fprintf (FpFile, " Flags 0x%08X\n", (unsigned) Caps= uleHeader->Flags); + fprintf (FpFile, " Capsule image size 0x%08X\n", (unsigned) Caps= uleHeader->CapsuleImageSize); + fclose (FpFile); + } } else if (CapsuleFlag) { VerboseMsg ("Create capsule image"); // --=20 2.12.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel