[PATCH] IntelFsp2Pkg: Raise exception for invalid BSF option

[PATCH] IntelFsp2Pkg: Raise exception for invalid BSF option

[rthomaiy]

Raise exception for invalid BSF option in GenCfgOpt.py

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Richard Thomaiyar <richard.marian.thomaiyar@intel.com>
---
 IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py b/IntelFsp2Pkg/Tools/GenCfgOpt.py
index d8038e9..6dc1b10 100644
--- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
+++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
@@ -1,6 +1,6 @@
 ## @ GenCfgOpt.py
 #
-# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
 # This program and the accompanying materials are licensed and made available under
 # the terms and conditions of the BSD License that accompanies this distribution.
 # The full text of the license may be found at
@@ -1239,6 +1239,7 @@ EndList
         return 0
 
     def WriteBsfStruct  (self, BsfFd, Item):
+        LogExpr = CLogicalExpression()
         if Item['type'] == "None":
             Space = "gPlatformFspPkgTokenSpaceGuid"
         else:
@@ -1260,6 +1261,9 @@ EndList
                 for Option in OptList:
                     Option = Option.strip()
                     (OpVal, OpStr) = Option.split(':')
+                    test = LogExpr.getNumber (OpVal)
+                    if test is None:
+                        raise Exception("Selection Index '%s' is not a number" % OpVal)
                     TmpList.append((OpVal, OpStr))
         return  TmpList
 
-- 
2.9.0.windows.1

Re: [PATCH] IntelFsp2Pkg: Raise exception for invalid BSF option

[Yao, Jiewen]

Reviewed-by: jiewen.yao@Intel.com

> -----Original Message-----
> From: Thomaiyar, Richard Marian
> Sent: Wednesday, March 15, 2017 5:24 PM
> To: edk2-devel@lists.01.org
> Cc: Ma, Maurice <maurice.ma@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>;
> Thomaiyar, Richard Marian <richard.marian.thomaiyar@intel.com>
> Subject: [PATCH] IntelFsp2Pkg: Raise exception for invalid BSF option
> 
> Raise exception for invalid BSF option in GenCfgOpt.py
> 
> Cc: Maurice Ma <maurice.ma@intel.com>
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Richard Thomaiyar <richard.marian.thomaiyar@intel.com>
> ---
>  IntelFsp2Pkg/Tools/GenCfgOpt.py | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> index d8038e9..6dc1b10 100644
> --- a/IntelFsp2Pkg/Tools/GenCfgOpt.py
> +++ b/IntelFsp2Pkg/Tools/GenCfgOpt.py
> @@ -1,6 +1,6 @@
>  ## @ GenCfgOpt.py
>  #
> -# Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>
>  # This program and the accompanying materials are licensed and made available
> under
>  # the terms and conditions of the BSD License that accompanies this
> distribution.
>  # The full text of the license may be found at
> @@ -1239,6 +1239,7 @@ EndList
>          return 0
> 
>      def WriteBsfStruct  (self, BsfFd, Item):
> +        LogExpr = CLogicalExpression()
>          if Item['type'] == "None":
>              Space = "gPlatformFspPkgTokenSpaceGuid"
>          else:
> @@ -1260,6 +1261,9 @@ EndList
>                  for Option in OptList:
>                      Option = Option.strip()
>                      (OpVal, OpStr) = Option.split(':')
> +                    test = LogExpr.getNumber (OpVal)
> +                    if test is None:
> +                        raise Exception("Selection Index '%s' is not a
> number" % OpVal)
>                      TmpList.append((OpVal, OpStr))
>          return  TmpList
> 
> --
> 2.9.0.windows.1