escape text (e.g. ampersand in group names) and test for it

unified-font-object · Feb 5, 2016 · ab56841 · ab56841
1 parent bb65963
commit ab56841
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/normalization/test_ufonormalizer.py b/normalization/test_ufonormalizer.py
@@ -1291,8 +1291,12 @@ def test_convert_plist_Element_to_object(self):
         self.assertEqual(_convertPlistElementToObject(element), {})
         element = ET.fromstring("<dict><key>foo</key><string>bar</string></dict>")
         self.assertEqual(_convertPlistElementToObject(element), {'foo': 'bar'})
+        element = ET.fromstring("<dict><key>A&amp;B</key><string>B&amp;A</string></dict>")
+        self.assertEqual(_convertPlistElementToObject(element), {'A&amp;B': 'B&amp;A'})
         element = ET.fromstring("<string>foo</string>")
         self.assertEqual(_convertPlistElementToObject(element), 'foo')
+        element = ET.fromstring("<string>&amp;</string>")
+        self.assertEqual(_convertPlistElementToObject(element), '&amp;')
         element = ET.fromstring("<date>2015-07-05T22:16:18Z</date>")
         self.assertEqual(_convertPlistElementToObject(element),
                          datetime.datetime(2015, 7, 5, 22, 16, 18))

diff --git a/normalization/ufonormalizer.py b/normalization/ufonormalizer.py
@@ -1044,11 +1044,11 @@ def _convertPlistElementToObject(element):
         key = None
         for subElement in element:
             if subElement.tag == "key":
-                key = subElement.text
+                key = xmlEscapeText(subElement.text)
             else:
                 obj[key] = _convertPlistElementToObject(subElement)
     elif tag == "string":
-        return element.text
+        return xmlEscapeText(element.text)
     elif tag == "data":
         return plistlib.Data.fromBase64(element.text)
     elif tag == "date":
@@ -1211,12 +1211,12 @@ def _plistArray(self, data):
     def _plistDict(self, data):
         self.beginElement("dict")
         for key, value in sorted(data.items()):
-            self.simpleElement("key", value=key)
+            self.simpleElement("key", value=xmlEscapeText(key))
             self.propertyListObject(value)
         self.endElement("dict")
 
     def _plistString(self, data):
-        self.simpleElement("string", value=data)
+        self.simpleElement("string", value=xmlEscapeText(data))
 
     def _plistBoolean(self, data):
         if data:
@@ -1265,9 +1265,10 @@ def attributesToString(self, attrs):
 
 
 def xmlEscapeText(text):
-    text = text.replace("&", "&amp;")
-    text = text.replace("<", "&lt;")
-    text = text.replace(">", "&gt;")
+    if text:
+        text = text.replace("&", "&amp;")
+        text = text.replace("<", "&lt;")
+        text = text.replace(">", "&gt;")
     return text
 
 def xmlEscapeAttribute(text):