sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Report error for incorrect hex value format

Browse Source 
The case is user use 0x1} as a hex value for Pcd, it directly cause
tool report traceback info. This patch add more error info.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
zhijufan
2018-09-11 10:49:34 +08:00
committed by Yonghong Zhu
parent 5c9ac43f47
commit b62cbfb787
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BaseTools/Source/Python/Common/Misc.py
View File

@ -1414,7 +1414,10 @@ def ParseFieldValue (Value):
Value = Value.strip().strip('"') Value = Value.strip().strip('"')
return ParseDevPathValue(Value) return ParseDevPathValue(Value)
if Value.lower().startswith('0x'): if Value.lower().startswith('0x'):
Value = int(Value, 16) try:
Value = int(Value, 16)
except:
raise BadExpression("invalid hex value: %s" % Value)
if Value == 0: if Value == 0:
return 0, 1 return 0, 1
return Value, (Value.bit_length() + 7) / 8 return Value, (Value.bit_length() + 7) / 8