[PATCH] BaseTools: Fix flexible PCD DEVICE_PATH parse issue

[PATCH] BaseTools: Fix flexible PCD DEVICE_PATH parse issue

[Feng, YunhuaX]

When the format of DEVICE_PATH have string, like as:
{DEVICE_PATH("BBS(1,"AB",0)")} have string "AB", will
get the wrong value.

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>
---
 BaseTools/Source/Python/Common/Misc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index b34cb4c3be..08523e4669 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1597,11 +1597,12 @@ def ParseFieldValue (Value):
             RetSize += Size
             for I in range(Size):
                 Value = (Value << 8) | ((ItemValue >> 8 * I) & 0xff)
         return Value, RetSize
     if Value.startswith('DEVICE_PATH(') and Value.endswith(')'):
-        Value = Value.split('"')[1]
+        Value = Value.replace("DEVICE_PATH(", '').rstrip(')')
+        Value = Value.strip().strip('"')
         return ParseDevPathValue(Value)
     if Value.lower().startswith('0x'):
         Value = int(Value, 16)
         if Value == 0:
             return 0, 1
-- 
2.12.2.windows.2

Re: [PATCH] BaseTools: Fix flexible PCD DEVICE_PATH parse issue

[Zhu, Yonghong]

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

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Feng, YunhuaX 
Sent: Tuesday, February 06, 2018 10:20 AM
To: edk2-devel@lists.01.org
Cc: Zhu, Yonghong <yonghong.zhu@intel.com>; Gao, Liming <liming.gao@intel.com>
Subject: [PATCH] BaseTools: Fix flexible PCD DEVICE_PATH parse issue

When the format of DEVICE_PATH have string, like as:
{DEVICE_PATH("BBS(1,"AB",0)")} have string "AB", will get the wrong value.

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>
---
 BaseTools/Source/Python/Common/Misc.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index b34cb4c3be..08523e4669 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1597,11 +1597,12 @@ def ParseFieldValue (Value):
             RetSize += Size
             for I in range(Size):
                 Value = (Value << 8) | ((ItemValue >> 8 * I) & 0xff)
         return Value, RetSize
     if Value.startswith('DEVICE_PATH(') and Value.endswith(')'):
-        Value = Value.split('"')[1]
+        Value = Value.replace("DEVICE_PATH(", '').rstrip(')')
+        Value = Value.strip().strip('"')
         return ParseDevPathValue(Value)
     if Value.lower().startswith('0x'):
         Value = int(Value, 16)
         if Value == 0:
             return 0, 1
--
2.12.2.windows.2