LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 14:40:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

better xml text and attribute escaping

Browse Source
This commit is contained in:
[email protected]
2016-03-08 14:00:41 +01:00
parent 406ada8f1e
commit c2ad1a8546
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/xfl/XFLXmlWriter.java
+24 -5
View File
@@ -16,7 +16,6 @@
*/
package com.jpexs.decompiler.flash.xfl;
import com.jpexs.helpers.Helper;
import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
@@ -30,6 +29,8 @@ import javax.xml.stream.XMLStreamWriter;
*/
public class XFLXmlWriter implements XMLStreamWriter {
private String newLineCharacters = "\n"; //Helper.newLine;
private boolean newLine = true;
private boolean newLineNeeded = false;
@@ -61,7 +62,7 @@ public class XFLXmlWriter implements XMLStreamWriter {
private void makeNewLine() {
if (!newLine) {
sb.append(Helper.newLine);
sb.append(newLineCharacters);
newLine = true;
for (int i = 0; i < tagsStack.size(); i++) {
sb.append(" ");
@@ -212,7 +213,7 @@ public class XFLXmlWriter implements XMLStreamWriter {
@Override
public void writeAttribute(String localName, String value) throws XMLStreamException {
ensureStartElementOpen();
append(' ').append(localName).append("=\"").append(Helper.escapeHTML(value)).append('"');
append(' ').append(localName).append("=\"").append(escapeAttribute(value)).append('"');
}
@Override
@@ -228,7 +229,7 @@ public class XFLXmlWriter implements XMLStreamWriter {
private void writeAttributeInternal(String prefix, String localName, String value) throws XMLStreamException {
ensureStartElementOpen();
append(' ').append(prefix).append(':').append(localName).append("=\"").append(Helper.escapeHTML(value)).append('"');
append(' ').append(prefix).append(':').append(localName).append("=\"").append(escapeAttribute(value)).append('"');
}
@Override
@@ -283,7 +284,7 @@ public class XFLXmlWriter implements XMLStreamWriter {
@Override
public void writeCharacters(String text) throws XMLStreamException {
closeStartElement();
append(Helper.escapeHTML(text));
append(escapeText(text));
}
public void writeCharactersRaw(String text) throws XMLStreamException {
@@ -324,4 +325,22 @@ public class XFLXmlWriter implements XMLStreamWriter {
public Object getProperty(String name) throws IllegalArgumentException {
return null;
}
public static String escapeText(String text) {
String[] from = new String[]{"&", "<"};
String[] to = new String[]{"&amp;", "&lt;"};
for (int i = 0; i < from.length; i++) {
text = text.replace(from[i], to[i]);
}
return text;
}
public static String escapeAttribute(String text) {
String[] from = new String[]{"&", "<", "\"", "'", "\r", "\n"};
String[] to = new String[]{"&amp;", "&lt;", "&quot;", "&#x27;", "&#xD;", "&#xD;"};
for (int i = 0; i < from.length; i++) {
text = text.replace(from[i], to[i]);
}
return text;
}
}