|
 |
22b8d9c |
From 84d64059dd0082609a43c7938a8a35e10da10706 Mon Sep 17 00:00:00 2001
|
|
|
22b8d9c |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
22b8d9c |
Date: Mon, 24 Jan 2022 11:03:25 +0100
|
|
|
22b8d9c |
Subject: [PATCH 30/32] BaseTools: fix gcc12 warning
|
|
|
22b8d9c |
MIME-Version: 1.0
|
|
|
22b8d9c |
Content-Type: text/plain; charset=UTF-8
|
|
|
22b8d9c |
Content-Transfer-Encoding: 8bit
|
|
|
22b8d9c |
|
|
|
22b8d9c |
GenFfs.c:545:5: error: pointer ‘InFileHandle’ used after ‘fclose’ [-Werror=use-after-free]
|
|
|
22b8d9c |
545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
|
|
22b8d9c |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
22b8d9c |
GenFfs.c:544:5: note: call to ‘fclose’ here
|
|
|
22b8d9c |
544 | fclose (InFileHandle);
|
|
|
22b8d9c |
| ^~~~~~~~~~~~~~~~~~~~~
|
|
|
22b8d9c |
|
|
|
22b8d9c |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
22b8d9c |
---
|
|
|
22b8d9c |
BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
|
|
|
22b8d9c |
BaseTools/Source/C/GenSec/GenSec.c | 2 +-
|
|
|
22b8d9c |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
22b8d9c |
|
|
|
22b8d9c |
diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
|
|
|
22b8d9c |
index 949025c33325..d78d62ab3689 100644
|
|
|
22b8d9c |
--- a/BaseTools/Source/C/GenFfs/GenFfs.c
|
|
|
22b8d9c |
+++ b/BaseTools/Source/C/GenFfs/GenFfs.c
|
|
|
22b8d9c |
@@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
|
|
|
22b8d9c |
PeFileBuffer = (UINT8 *) malloc (PeFileSize);
|
|
|
22b8d9c |
if (PeFileBuffer == NULL) {
|
|
|
22b8d9c |
fclose (InFileHandle);
|
|
|
22b8d9c |
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
|
|
22b8d9c |
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
|
|
22b8d9c |
return EFI_OUT_OF_RESOURCES;
|
|
|
22b8d9c |
}
|
|
|
22b8d9c |
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
|
|
22b8d9c |
diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
|
|
|
22b8d9c |
index d54a4f9e0a7d..b1d05367ec0b 100644
|
|
|
22b8d9c |
--- a/BaseTools/Source/C/GenSec/GenSec.c
|
|
|
22b8d9c |
+++ b/BaseTools/Source/C/GenSec/GenSec.c
|
|
|
22b8d9c |
@@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment)
|
|
|
22b8d9c |
PeFileBuffer = (UINT8 *) malloc (PeFileSize);
|
|
|
22b8d9c |
if (PeFileBuffer == NULL) {
|
|
|
22b8d9c |
fclose (InFileHandle);
|
|
|
22b8d9c |
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
|
|
22b8d9c |
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
|
|
22b8d9c |
return EFI_OUT_OF_RESOURCES;
|
|
|
22b8d9c |
}
|
|
|
22b8d9c |
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
|
|
22b8d9c |
--
|
|
|
22b8d9c |
2.35.1
|
|
|
22b8d9c |
|