From: Liming Gao <liming.gao@intel.com>
Date: Tue, 26 Dec 2017 07:59:09 +0000 (+0800)
Subject: BaseTools: Update SkuId checker to make sure it be valid UINT64 value
X-Git-Tag: edk2-stable201903~2729
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e4ff28c3ac72f946686e715bc32490b35c08ad5b

BaseTools: Update SkuId checker to make sure it be valid UINT64 value

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

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 0374be0631..f44000829a 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -2149,10 +2149,10 @@ class SkuClass():
         for SkuName in SkuIds:
             SkuId = SkuIds[SkuName][0]
             skuid_num = int(SkuId,16) if SkuId.upper().startswith("0X") else int(SkuId)
-            if skuid_num > 0xFFFF:
+            if skuid_num > 0xFFFFFFFFFFFFFFFF:
                 EdkLogger.error("build", PARAMETER_INVALID,
-                            ExtraData = "SKU-ID [%s] must less than 65535"
-                                      % (SkuName))
+                            ExtraData = "SKU-ID [%s] value %s exceeds the max value of UINT64"
+                                      % (SkuName, SkuId))
         
         self.AvailableSkuIds = sdict()
         self.SkuIdSet = []