b436e3c8aa
reference: https://github.com/google/brotli/pull/893 https://github.com/tianocore/edk2/pull/2347 https://github.com/tianocore/edk2/pull/2694 Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
From 7b005f344e533cd913c3ca05b266f9872df886d1 Mon Sep 17 00:00:00 2001
|
|
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Thu, 24 Mar 2022 20:04:34 +0800
|
|
Subject: [PATCH 1/3] 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>
|
|
|
|
reference: https://github.com/tianocore/edk2/pull/2694
|
|
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
|
|
---
|
|
BaseTools/Source/C/GenFfs/GenFfs.c | 2 +-
|
|
BaseTools/Source/C/GenSec/GenSec.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c
|
|
index 949025c333..d78d62ab36 100644
|
|
--- 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);
|
|
if (PeFileBuffer == NULL) {
|
|
fclose (InFileHandle);
|
|
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
|
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
|
return EFI_OUT_OF_RESOURCES;
|
|
}
|
|
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
|
diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c
|
|
index d54a4f9e0a..b1d05367ec 100644
|
|
--- 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);
|
|
if (PeFileBuffer == NULL) {
|
|
fclose (InFileHandle);
|
|
- Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
|
+ Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
|
return EFI_OUT_OF_RESOURCES;
|
|
}
|
|
fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
|
--
|
|
2.41.0
|