]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools/GenFv: Add check to ensure the file handle status is correct
authorHao Wu <hao.a.wu@intel.com>
Thu, 30 Nov 2017 08:44:14 +0000 (16:44 +0800)
committerHao Wu <hao.a.wu@intel.com>
Mon, 25 Dec 2017 01:54:04 +0000 (09:54 +0800)
Add an extra NULL check for the file handle to ensure that its status is
correct.

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
BaseTools/Source/C/GenFv/GenFv.c

index 4de24b9f7ec1b610b2158b468d99b8886607f8af..be3184031056a53dcea2bd3d6e8116a332d32fda 100644 (file)
@@ -4,7 +4,7 @@
   can be found in the Tiano Firmware Volume Generation Utility \r
   Specification, review draft.\r
 \r
-Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -607,23 +607,25 @@ Returns:
         return STATUS_ERROR;\r
       }\r
     }\r
-    fprintf (FpFile, "Capsule %s Image Header Information\n", InfFileName);\r
-    fprintf (FpFile, "  GUID                  %08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X\n", \r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data1,\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data2,\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data3,\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[0],\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[1],\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[2],\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[3],\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[4],\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[5],\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[6],\r
-                    (unsigned) CapsuleHeader->CapsuleGuid.Data4[7]);\r
-    fprintf (FpFile, "  Header size           0x%08X\n", (unsigned) CapsuleHeader->HeaderSize);\r
-    fprintf (FpFile, "  Flags                 0x%08X\n", (unsigned) CapsuleHeader->Flags);\r
-    fprintf (FpFile, "  Capsule image size    0x%08X\n", (unsigned) CapsuleHeader->CapsuleImageSize);\r
-    fclose (FpFile);\r
+    if (FpFile != NULL) {\r
+      fprintf (FpFile, "Capsule %s Image Header Information\n", InfFileName);\r
+      fprintf (FpFile, "  GUID                  %08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data1,\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data2,\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data3,\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[0],\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[1],\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[2],\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[3],\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[4],\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[5],\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[6],\r
+                      (unsigned) CapsuleHeader->CapsuleGuid.Data4[7]);\r
+      fprintf (FpFile, "  Header size           0x%08X\n", (unsigned) CapsuleHeader->HeaderSize);\r
+      fprintf (FpFile, "  Flags                 0x%08X\n", (unsigned) CapsuleHeader->Flags);\r
+      fprintf (FpFile, "  Capsule image size    0x%08X\n", (unsigned) CapsuleHeader->CapsuleImageSize);\r
+      fclose (FpFile);\r
+    }\r
   } else if (CapsuleFlag) {\r
     VerboseMsg ("Create capsule image");\r
     //\r