Reviewed-by: Yonghong Zhu
Best Regards,
Zhu Yonghong
-Original Message-
From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Yonghong
Zhu
Sent: Tuesday, October 16, 2018 4:29 PM
To: edk2-devel@lists.01.org
Cc: Chen, Hesheng
Subject: [edk2] [PATCH] BaseTools/UPT: Fix an issue of UNI string checking.
From: Hess Chen
The tool now can detect the error that the content between double quotes
contains another double quotes or enter key.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen
---
.../Source/Python/UPT/Library/UniClassObject.py| 23 ++
1 file changed, 23 insertions(+)
diff --git a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
index 670cf3b4ee..cd575d5a34 100644
--- a/BaseTools/Source/Python/UPT/Library/UniClassObject.py
+++ b/BaseTools/Source/Python/UPT/Library/UniClassObject.py
@@ -566,6 +566,22 @@ class UniFileClassObject(object):
if Line.startswith(u'#language') and len(Line.split()) == 2:
MultiLineFeedExits = True
+#
+# Check the situation that there only has one '"' for the language
entry
+#
+if Line.startswith(u'#string') and Line.find(u'#language') > 0 and
Line.count(u'"') == 1:
+EdkLogger.Error("Unicode File Parser",
ToolError.FORMAT_INVALID,
+ExtraData='''The line %s misses '"' at the end
of it in file %s'''
+% (LineCount, File.Path))
+
+#
+# Check the situation that there has more than 2 '"' for the
language entry
+#
+if Line.startswith(u'#string') and Line.find(u'#language') > 0 and
Line.replace(u'\\"', '').count(u'"') > 2:
+EdkLogger.Error("Unicode File Parser",
ToolError.FORMAT_INVALID,
+ExtraData='''The line %s has more than 2 '"'
for language entry in file %s'''
+% (LineCount, File.Path))
+
#
# Between two String entry, can not contain line feed
#
@@ -727,6 +743,13 @@ class UniFileClassObject(object):
else:
EdkLogger.Error("Unicode File Parser",
ToolError.FORMAT_INVALID, ExtraData=File.Path)
elif Line.startswith(u'"'):
+#
+# Check the situation that there has more than 2 '"' for the
language entry
+#
+if Line.replace(u'\\"', '').count(u'"') > 2:
+EdkLogger.Error("Unicode File Parser",
ToolError.FORMAT_INVALID,
+ExtraData='''The line %s has more than 2
'"' for language entry in file %s'''
+% (LineCount, File.Path))
if u'#string' in Line or u'#language' in Line:
EdkLogger.Error("Unicode File Parser",
ToolError.FORMAT_INVALID, ExtraData=File.Path)
NewLines.append(Line)
--
2.14.2.windows.2
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
___
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
