From f6401aedca2d576f4229c54c1356fea23387981f Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Thu, 30 Nov 2017 16:44:14 +0800 Subject: [PATCH] BaseTools/GenFv: Add check to ensure the file handle status is correct Add an extra NULL check for the file handle to ensure that its status is correct. Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu Reviewed-by: Liming Gao --- 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/GenFv.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 Specification, review draft. -Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License which accompanies this distribution. The full text of the license may be found at @@ -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", - (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) CapsuleHeader->HeaderSize); - fprintf (FpFile, " Flags 0x%08X\n", (unsigned) CapsuleHeader->Flags); - fprintf (FpFile, " Capsule image size 0x%08X\n", (unsigned) CapsuleHeader->CapsuleImageSize); - fclose (FpFile); + if (FpFile != NULL) { + fprintf (FpFile, "Capsule %s Image Header Information\n", InfFileName); + fprintf (FpFile, " GUID %08X-%04X-%04X-%02X%02X-%02X%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) CapsuleHeader->HeaderSize); + fprintf (FpFile, " Flags 0x%08X\n", (unsigned) CapsuleHeader->Flags); + fprintf (FpFile, " Capsule image size 0x%08X\n", (unsigned) CapsuleHeader->CapsuleImageSize); + fclose (FpFile); + } } else if (CapsuleFlag) { VerboseMsg ("Create capsule image"); // -- 2.39.2