mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-15 16:52:07 +01:00
Escapes invalid charactes of the "to" and "from" fields in #toXML. SMACK-135
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@2315 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
5fdc96acab
commit
7905307d5f
3 changed files with 10 additions and 6 deletions
|
@ -52,6 +52,8 @@
|
|||
|
||||
package org.jivesoftware.smack.packet;
|
||||
|
||||
import org.jivesoftware.smack.util.StringUtils;
|
||||
|
||||
/**
|
||||
* The base IQ (Info/Query) packet. IQ packets are used to get and set information
|
||||
* on the server, including authentication, roster operations, and creating
|
||||
|
@ -103,10 +105,10 @@ public abstract class IQ extends Packet {
|
|||
buf.append("id=\"" + getPacketID() + "\" ");
|
||||
}
|
||||
if (getTo() != null) {
|
||||
buf.append("to=\"").append(getTo()).append("\" ");
|
||||
buf.append("to=\"").append(StringUtils.escapeForXML(getTo())).append("\" ");
|
||||
}
|
||||
if (getFrom() != null) {
|
||||
buf.append("from=\"").append(getFrom()).append("\" ");
|
||||
buf.append("from=\"").append(StringUtils.escapeForXML(getFrom())).append("\" ");
|
||||
}
|
||||
if (type == null) {
|
||||
buf.append("type=\"get\">");
|
||||
|
|
|
@ -203,10 +203,10 @@ public class Message extends Packet {
|
|||
buf.append(" id=\"").append(getPacketID()).append("\"");
|
||||
}
|
||||
if (getTo() != null) {
|
||||
buf.append(" to=\"").append(getTo()).append("\"");
|
||||
buf.append(" to=\"").append(StringUtils.escapeForXML(getTo())).append("\"");
|
||||
}
|
||||
if (getFrom() != null) {
|
||||
buf.append(" from=\"").append(getFrom()).append("\"");
|
||||
buf.append(" from=\"").append(StringUtils.escapeForXML(getFrom())).append("\"");
|
||||
}
|
||||
if (type != Type.NORMAL) {
|
||||
buf.append(" type=\"").append(type).append("\"");
|
||||
|
|
|
@ -52,6 +52,8 @@
|
|||
|
||||
package org.jivesoftware.smack.packet;
|
||||
|
||||
import org.jivesoftware.smack.util.StringUtils;
|
||||
|
||||
/**
|
||||
* Represents XMPP presence packets. Every presence packet has a type, which is one of
|
||||
* the following values:
|
||||
|
@ -199,10 +201,10 @@ public class Presence extends Packet {
|
|||
buf.append(" id=\"").append(getPacketID()).append("\"");
|
||||
}
|
||||
if (getTo() != null) {
|
||||
buf.append(" to=\"").append(getTo()).append("\"");
|
||||
buf.append(" to=\"").append(StringUtils.escapeForXML(getTo())).append("\"");
|
||||
}
|
||||
if (getFrom() != null) {
|
||||
buf.append(" from=\"").append(getFrom()).append("\"");
|
||||
buf.append(" from=\"").append(StringUtils.escapeForXML(getFrom())).append("\"");
|
||||
}
|
||||
if (type != Type.AVAILABLE) {
|
||||
buf.append(" type=\"").append(type).append("\"");
|
||||
|
|
Loading…
Reference in a new issue