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

[edk2] [Patch] BaseTools: Update SkuId checker to make sure it be valid UINT64 value

Posted by Liming Gao 6 years, 4 months ago

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Common/Misc.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 0374be0..f440008 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 = []
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] BaseTools: Update SkuId checker to make sure it be valid UINT64 value

Posted by Zhu, Yonghong 6 years, 4 months ago

Please remove the " Signed-off-by" info in Cc.

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com> 

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Gao, Liming 
Sent: Tuesday, December 26, 2017 3:59 PM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
Subject: [Patch] 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: Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Common/Misc.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 0374be0..f440008 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 = []
-- 
2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [Patch] BaseTools: Update SkuId checker to make sure it be valid UINT64 value

Posted by Gao, Liming 6 years, 4 months ago

Sorry. I will remove it. 

>-----Original Message-----
>From: Zhu, Yonghong
>Sent: Tuesday, December 26, 2017 4:04 PM
>To: Gao, Liming <liming.gao@intel.com>; edk2-devel@lists.01.org
>Cc: Feng, Bob C <bob.c.feng@intel.com>; Zhu, Yonghong
><yonghong.zhu@intel.com>
>Subject: RE: [Patch] BaseTools: Update SkuId checker to make sure it be valid
>UINT64 value
>
>Please remove the " Signed-off-by" info in Cc.
>
>Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
>
>Best Regards,
>Zhu Yonghong
>
>
>-----Original Message-----
>From: Gao, Liming
>Sent: Tuesday, December 26, 2017 3:59 PM
>To: edk2-devel@lists.01.org
>Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Feng, Bob C
><bob.c.feng@intel.com>
>Subject: [Patch] 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: Signed-off-by: Bob Feng <bob.c.feng@intel.com>
>---
> BaseTools/Source/Python/Common/Misc.py | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Common/Misc.py
>b/BaseTools/Source/Python/Common/Misc.py
>index 0374be0..f440008 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 = []
>--
>2.8.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel