Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 08:12:05 +01:00
Code Issues Releases Wiki Activity

Re-escape XML text in parseContentDepth()

Browse source 
SMACK-680.
This commit is contained in:
Florian Schmaus 2015-07-02 09:16:21 +02:00
parent a9741a8b10
commit e6a403fb1c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
View file

@ -481,7 +481,7 @@ public class PacketParserUtils {
} }
break; break;
case XmlPullParser.TEXT: case XmlPullParser.TEXT:
xml.append(parser.getText()); xml.escape(parser.getText());
break; break;
} }
event = parser.next(); event = parser.next();
@ -497,7 +497,12 @@ public class PacketParserUtils {
// Only append the text if the parser is not on on an empty element' start tag. Empty elements are reported // Only append the text if the parser is not on on an empty element' start tag. Empty elements are reported
// twice, so in order to prevent duplication we only add their text when we are on their end tag. // twice, so in order to prevent duplication we only add their text when we are on their end tag.
if (!(event == XmlPullParser.START_TAG && parser.isEmptyElementTag())) { if (!(event == XmlPullParser.START_TAG && parser.isEmptyElementTag())) {
sb.append(parser.getText()); CharSequence text = parser.getText();
if (event == XmlPullParser.TEXT) {
// TODO the toString() can be removed in Smack 4.2.
text = StringUtils.escapeForXML(text.toString());
}
sb.append(text);
} }
if (event == XmlPullParser.END_TAG && parser.getDepth() <= depth) { if (event == XmlPullParser.END_TAG && parser.getDepth() <= depth) {
break outerloop; break outerloop;