Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From 2435c17e56652479315853cec5b91fb0ea0911a3 Mon Sep 17 00:00:00 2001 |
| 2 | From: Gerd Hoffmann <kraxel@redhat.com> |
| 3 | Date: Thu, 24 Mar 2022 20:04:34 +0800 |
| 4 | Subject: [PATCH] BaseTools: fix gcc12 warning |
| 5 | |
| 6 | GenFfs.c:545:5: error: pointer ?InFileHandle? used after ?fclose? [-Werror=use-after-free] |
| 7 | 545 | Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle); |
| 8 | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 9 | GenFfs.c:544:5: note: call to ?fclose? here |
| 10 | 544 | fclose (InFileHandle); |
| 11 | | ^~~~~~~~~~~~~~~~~~~~~ |
| 12 | |
| 13 | Upstream-Status: Backport [https://github.com/tianocore/edk2/commit/7b005f344e533cd913c3ca05b266f9872df886d1] |
| 14 | Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| 15 | Reviewed-by: Bob Feng <bob.c.feng@intel.com> |
| 16 | --- |
| 17 | BaseTools/Source/C/GenFfs/GenFfs.c | 2 +- |
| 18 | BaseTools/Source/C/GenSec/GenSec.c | 2 +- |
| 19 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 20 | |
| 21 | diff --git a/BaseTools/Source/C/GenFfs/GenFfs.c b/BaseTools/Source/C/GenFfs/GenFfs.c |
| 22 | index 949025c333..d78d62ab36 100644 |
| 23 | --- a/BaseTools/Source/C/GenFfs/GenFfs.c |
| 24 | +++ b/BaseTools/Source/C/GenFfs/GenFfs.c |
| 25 | @@ -542,7 +542,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment) |
| 26 | PeFileBuffer = (UINT8 *) malloc (PeFileSize);
|
| 27 | if (PeFileBuffer == NULL) {
|
| 28 | fclose (InFileHandle);
|
| 29 | - Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
| 30 | + Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
| 31 | return EFI_OUT_OF_RESOURCES;
|
| 32 | }
|
| 33 | fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
| 34 | diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c |
| 35 | index d54a4f9e0a..b1d05367ec 100644 |
| 36 | --- a/BaseTools/Source/C/GenSec/GenSec.c |
| 37 | +++ b/BaseTools/Source/C/GenSec/GenSec.c |
| 38 | @@ -1062,7 +1062,7 @@ GetAlignmentFromFile(char *InFile, UINT32 *Alignment) |
| 39 | PeFileBuffer = (UINT8 *) malloc (PeFileSize);
|
| 40 | if (PeFileBuffer == NULL) {
|
| 41 | fclose (InFileHandle);
|
| 42 | - Error(NULL, 0, 4001, "Resource", "memory cannot be allocated of %s", InFileHandle);
|
| 43 | + Error(NULL, 0, 4001, "Resource", "memory cannot be allocated for %s", InFile);
|
| 44 | return EFI_OUT_OF_RESOURCES;
|
| 45 | }
|
| 46 | fread (PeFileBuffer, sizeof (UINT8), PeFileSize, InFileHandle);
|
| 47 | -- |
| 48 | 2.36.1 |
| 49 | |