[PATCH] IntelFsp2Pkg: Fix GCC49/XCODE build failure

[PATCH] IntelFsp2Pkg: Fix GCC49/XCODE build failure

[Chasel, Chiu]

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>
---
 IntelFsp2Pkg/FspSecCore/SecMain.c | 5 ++---
 1 file 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);
   }
-- 
2.13.3.windows.1

Re: [PATCH] IntelFsp2Pkg: Fix GCC49/XCODE build failure

[Yao, Jiewen]

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Chiu, Chasel
> Sent: Friday, October 26, 2018 11:19 AM
> To: edk2-devel@lists.01.org
> Cc: Yao, Jiewen <jiewen.yao@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>
> Subject: [PATCH] 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>
> ---
>  IntelFsp2Pkg/FspSecCore/SecMain.c | 5 ++---
>  1 file 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);
>    }
> --
> 2.13.3.windows.1