BaseTools: Check GUID C structure format

GUID C format must conform to {8,4,4,{2,2,2,2,2,2,2,2}}

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 430bf6bcda..fc90ccb2c8 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -360,6 +360,8 @@ def GuidStructureByteArrayToGuidString(GuidValue):
 #   @retval     string      The GUID value in xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx format

 #

 def GuidStructureStringToGuidString(GuidValue):

+    if not GlobalData.gGuidCFormatPattern.match(GuidValue):

+        return ''

     guidValueString = GuidValue.lower().replace("{", "").replace("}", "").replace(" ", "").replace(";", "")

     guidValueList = guidValueString.split(",")

     if len(guidValueList) != 11:

@@ -1327,7 +1329,7 @@ def ParseFieldValue (Value):
         Value = Value.split('(', 1)[1][:-1].strip()

         if Value[0] == '{' and Value[-1] == '}':

             TmpValue = GuidStructureStringToGuidString(Value)

-            if len(TmpValue) == 0:

+            if not TmpValue:

                 raise BadExpression("Invalid GUID value string %s" % Value)

             Value = TmpValue

         if Value[0] == '"' and Value[-1] == '"':