From 1e6e6e188e01fa08f653706076a6465e0fcb0441 Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Tue, 5 Dec 2017 21:52:40 +0800 Subject: [PATCH] BaseTools: Fix GenSec GCC make failure It is a regression bug introduced by the patch b37b108, it cause GenSec make failure on GCC Env. Cc: Liming Gao Cc: Leif Lindholm Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Tested-by: Leif Lindholm Tested-by: Laszlo Ersek Reviewed-by: Leif Lindholm Reviewed-by: Laszlo Ersek Reviewed-by: Liming Gao --- BaseTools/Source/C/GenSec/GenSec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/C/GenSec/GenSec.c b/BaseTools/Source/C/GenSec/GenSec.c index 2b2def1261..5545f12b74 100644 --- a/BaseTools/Source/C/GenSec/GenSec.c +++ b/BaseTools/Source/C/GenSec/GenSec.c @@ -1326,7 +1326,7 @@ Returns: DummyFile = fopen (LongFilePath (DummyFileName), "rb"); if (DummyFile == NULL) { Error (NULL, 0, 0001, "Error opening file", DummyFileName); - return EFI_ABORTED; + goto Finish; } fseek (DummyFile, 0, SEEK_END); @@ -1340,7 +1340,7 @@ Returns: InFile = fopen(LongFilePath(InputFileName[0]), "rb"); if (InFile == NULL) { Error (NULL, 0, 0001, "Error opening file", InputFileName[0]); - return EFI_ABORTED; + goto Finish; } fseek (InFile, 0, SEEK_END); @@ -1351,7 +1351,7 @@ Returns: fclose(InFile); DebugMsg (NULL, 0, 9, "Input files", "the input file name is %s and the size is %u bytes", InputFileName[0], (unsigned) InFileSize); if (InFileSize > DummyFileSize){ - if (stricmp(DummyFileBuffer, InFileBuffer + (InFileSize - DummyFileSize)) == 0){ + if (stricmp((CHAR8 *)DummyFileBuffer, (CHAR8 *)(InFileBuffer + (InFileSize - DummyFileSize))) == 0){ SectGuidHeaderLength = InFileSize - DummyFileSize; } } -- 2.39.2