Commit 882af040 authored by Sergey Toshin's avatar Sergey Toshin Committed by Skylot

Encodes XML attrs

parent aa8a298e
...@@ -256,7 +256,7 @@ public class BinaryXMLParser extends CommonBinaryParser { ...@@ -256,7 +256,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
writer.add(':'); writer.add(':');
writer.add(nsValue); writer.add(nsValue);
} }
writer.add("=\"").add(entry.getKey()).add("\""); writer.add("=\"").add(StringUtils.escapeXML(entry.getKey())).add("\"");
} }
} }
boolean attrNewLine = attributeCount != 1 && ATTR_NEW_LINE; boolean attrNewLine = attributeCount != 1 && ATTR_NEW_LINE;
...@@ -291,7 +291,7 @@ public class BinaryXMLParser extends CommonBinaryParser { ...@@ -291,7 +291,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
writer.add(attrName).add("=\""); writer.add(attrName).add("=\"");
String decodedAttr = ManifestAttributes.getInstance().decode(attrName, attrValData); String decodedAttr = ManifestAttributes.getInstance().decode(attrName, attrValData);
if (decodedAttr != null) { if (decodedAttr != null) {
writer.add(decodedAttr); writer.add(StringUtils.escapeXML(decodedAttr));
} else { } else {
decodeAttribute(attributeNS, attrValDataType, attrValData); decodeAttribute(attributeNS, attrValDataType, attrValData);
} }
...@@ -380,7 +380,7 @@ public class BinaryXMLParser extends CommonBinaryParser { ...@@ -380,7 +380,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
} }
} else { } else {
String str = valuesParser.decodeValue(attrValDataType, attrValData); String str = valuesParser.decodeValue(attrValDataType, attrValData);
writer.add(str != null ? str : "null"); writer.add(str != null ? StringUtils.escapeXML(str) : "null");
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment