Skip to content
Snippets Groups Projects

ovmf: Fix build with gcc 12.x and clang 14.x

Merged Bernhard Rosenkränzer requested to merge bero/oniro:feature/ovmf-gcc12 into kirkstone
Files
4
 
# SPDX-FileCopyrightText: TianoCore and contributors
 
#
 
# SPDX-License-Identifier: Apache-2.0
 
 
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] 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>
 
Signed-off-by: Bernhard Rosenkränzer <bernhard.rosenkraenzer.ext@huawei.com>
 
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
 
Upstream-Status: Backport [commit 7b005f344e533cd913c3ca05b266f9872df886d1]
 
---
 
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 949025c33325..d78d62ab3689 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 d54a4f9e0a7d..b1d05367ec0b 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);
Loading