BaseTools: fix gcc12 warning

GenFfs.c:545:5: error: pointer ?InFileHandle? used after ?fclose? [-Werror=use-after-free]
  545 |     Error(NULL, 0, 4001, "Resource", "memory cannot be allocated  of %s", InFileHandle);
      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
GenFfs.c:544:5: note: call to ?fclose? here
  544 |     fclose (InFileHandle);
      |     ^~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>

diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
index 949025c333251bc5776159a6c5355ea29e4ef987..d78d62ab3689fec6c93612550a66dafe7309c04e 100644 (file)
--- a/BaseTools/Source/C/GenFfs/GenFfs.c
+++ b/BaseTools/Source/C/GenFfs/GenFfs.c
@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
   PeFileBuffer = (UINT8 *) malloc (PeFileSize);\r
   if (PeFileBuffer == NULL) {\r
     fclose (InFileHandle);\r
-    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated  of %s", InFileHandle);\r
+    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);\r

diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
index d54a4f9e0a7d67b7c8494ab37011d6fb97468172..b1d05367ec0b7ef25e81a487b9b2231e0593333b 100644 (file)
--- a/BaseTools/Source/C/GenSec/GenSec.c
+++ b/BaseTools/Source/C/GenSec/GenSec.c
@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
   PeFileBuffer = (UINT8 *) malloc (PeFileSize);\r
   if (PeFileBuffer == NULL) {\r
     fclose (InFileHandle);\r
-    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated  of %s", InFileHandle);\r
+    Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
   fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);\r