From 2b4c07bc22af6caec94645e1f7e2a23646dc1333 Mon Sep 17 00:00:00 2001 From: "Feng, Bob C" Date: Tue, 13 Aug 2019 09:56:37 +0800 Subject: [PATCH] BaseTools: Add "-" in a re to parse line in .map file https://bugzilla.tianocore.org/show_bug.cgi?id=2058 If there are multiple module instances with different guid used in .dsc file, the temp path of the module will contain 8-4-4-4-12 format guid string. So "-" need to be added into the regular expression for parsing it correctly. Cc: Liming Gao Signed-off-by: Bob Feng Reviewed-by: Liming Gao --- BaseTools/Source/Python/Common/Misc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py index 26d149c270..554ec010dd 100644 --- a/BaseTools/Source/Python/Common/Misc.py +++ b/BaseTools/Source/Python/Common/Misc.py @@ -164,7 +164,7 @@ def _parseGeneral(lines, efifilepath, varnames): status = 0 #0 - beginning of file; 1 - PE section definition; 2 - symbol table secs = [] # key = section name varoffset = [] - symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$]+) +([\da-fA-F]+)', re.UNICODE) + symRe = re.compile('^([\da-fA-F]+):([\da-fA-F]+) +([\.:\\\\\w\?@\$-]+) +([\da-fA-F]+)', re.UNICODE) for line in lines: line = line.strip() -- 2.39.2