summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChasel, Chiu <chasel.chiu@intel.com>2018-10-26 10:41:49 +0800
committerChasel, Chiu <chasel.chiu@intel.com>2018-10-26 11:34:21 +0800
commit901ae29dfef82186b8a54d29738fbe18add18764 (patch)
treeb6053eff77c9100b59e84cbbef9bc1ca02d66d43
parent7db4034f9ac578f1d834ff5ad062b8982ec81137 (diff)
downloadedk2-901ae29dfef82186b8a54d29738fbe18add18764.tar.gz
edk2-901ae29dfef82186b8a54d29738fbe18add18764.tar.xz
edk2-901ae29dfef82186b8a54d29738fbe18add18764.zip
IntelFsp2Pkg: Fix GCC49/XCODE build failure
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1276 Fixed potentially uninitialized variable build failure caused by commit: b1cc6f672f3b924cdb190e5b92db3b47f46a8911 Test: Verified on internal platform and boots successfully. Cc: Jiewen Yao <Jiewen.yao@intel.com> Cc: Desimone Nathaniel L <nathaniel.l.desimone@intel.com> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Chasel Chiu <chasel.chiu@intel.com> Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
-rw-r--r--IntelFsp2Pkg/FspSecCore/SecMain.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/IntelFsp2Pkg/FspSecCore/SecMain.c b/IntelFsp2Pkg/FspSecCore/SecMain.c
index ddbfc4fcdf..f319c68cc5 100644
--- a/IntelFsp2Pkg/FspSecCore/SecMain.c
+++ b/IntelFsp2Pkg/FspSecCore/SecMain.c
@@ -107,13 +107,12 @@ SecStartup (
}
IdtSize = sizeof (IdtTableInStack.IdtTable);
} else {
- if (IdtDescriptor.Limit + 1 > sizeof (IdtTableInStack.IdtTable)) {
+ IdtSize = IdtDescriptor.Limit + 1;
+ if (IdtSize > sizeof (IdtTableInStack.IdtTable)) {
//
// ERROR: IDT table size from boot loader is larger than FSP can support, DeadLoop here!
//
CpuDeadLoop();
- } else {
- IdtSize = IdtDescriptor.Limit + 1;
}
CopyMem ((VOID *) (UINTN) &IdtTableInStack.IdtTable, (VOID *) IdtDescriptor.Base, IdtSize);
}