Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-17 04:32:04 +01:00
Code Issues Releases Wiki Activity

SMACK-415 Applied patch to fix improper use of parser.

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13590 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
rcollier 2013-03-23 22:18:38 +00:00
parent b0bdd56b20
commit d1fdd497d9
1 changed files with 75 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

118
source/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
View file

@ -24,53 +24,85 @@ import org.jivesoftware.smackx.pubsub.packet.PubSubNamespace;
import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParser;
/** /**
* Parses an <b>item</b> element as is defined in both the {@link PubSubNamespace#BASIC} and {@link PubSubNamespace#EVENT} * Parses an <b>item</b> element as is defined in both the {@link PubSubNamespace#BASIC} and
* namespaces. To parse the item contents, it will use whatever {@link PacketExtensionProvider} is registered in * {@link PubSubNamespace#EVENT} namespaces. To parse the item contents, it will use whatever
* <b>smack.providers</b> for its element name and namespace. If no provider is registered, it will return a {@link SimplePayload}. * {@link PacketExtensionProvider} is registered in <b>smack.providers</b> for its element name and namespace. If no
* provider is registered, it will return a {@link SimplePayload}.
* *
* @author Robin Collier * @author Robin Collier
*/ */
public class ItemProvider implements PacketExtensionProvider public class ItemProvider implements PacketExtensionProvider
{ {
public PacketExtension parseExtension(XmlPullParser parser) throws Exception public PacketExtension parseExtension(XmlPullParser parser) throws Exception
{ {
String id = parser.getAttributeValue(null, "id"); String id = parser.getAttributeValue(null, "id");
String node = parser.getAttributeValue(null, "node"); String node = parser.getAttributeValue(null, "node");
String elem = parser.getName(); String elem = parser.getName();
int tag = parser.next(); int tag = parser.next();
if (tag == XmlPullParser.END_TAG) if (tag == XmlPullParser.END_TAG)
{ {
return new Item(id, node); return new Item(id, node);
} }
else else
{ {
String payloadElemName = parser.getName(); String payloadElemName = parser.getName();
String payloadNS = parser.getNamespace(); String payloadNS = parser.getNamespace();
if (ProviderManager.getInstance().getExtensionProvider(payloadElemName, payloadNS) == null) if (ProviderManager.getInstance().getExtensionProvider(payloadElemName, payloadNS) == null)
{ {
boolean done = false; boolean done = false;
StringBuilder payloadText = new StringBuilder(); StringBuilder payloadText = new StringBuilder();
while (!done) while (!done)
{ {
if (tag == XmlPullParser.END_TAG && parser.getName().equals(elem)) if (tag == XmlPullParser.END_TAG && parser.getName().equals(elem))
done = true; {
else if (!((tag == XmlPullParser.START_TAG) && parser.isEmptyElementTag())) done = true;
payloadText.append(parser.getText()); }
else if (parser.getEventType() == XmlPullParser.START_TAG)
if (!done) {
tag = parser.next(); payloadText.append("<").append(parser.getName());
}
return new PayloadItem<SimplePayload>(id, node, new SimplePayload(payloadElemName, payloadNS, payloadText.toString())); if (parser.getName().equals(payloadElemName) && (!payloadNS.isEmpty()))
} payloadText.append(" xmlns=\"").append(payloadNS).append("\"");
else int n = parser.getAttributeCount();
{
return new PayloadItem<PacketExtension>(id, node, PacketParserUtils.parsePacketExtension(payloadElemName, payloadNS, parser)); for (int i = 0; i < n; i++)
} payloadText.append(" ").append(parser.getAttributeName(i)).append("=\"")
} .append(parser.getAttributeValue(i)).append("\"");
}
if (parser.isEmptyElementTag())
{
payloadText.append("/>");
done = true;
}
else
{
payloadText.append(">");
}
}
else if (parser.getEventType() == XmlPullParser.END_TAG)
{
if (done)
done = false;
else
payloadText.append("</").append(parser.getName()).append(">");
}
else if (parser.getEventType() == XmlPullParser.TEXT)
{
payloadText.append(parser.getText());
}
tag = parser.next();
}
return new PayloadItem<SimplePayload>(id, node, new SimplePayload(payloadElemName, payloadNS, payloadText.toString()));
}
else {
return new PayloadItem<PacketExtension>(id, node, PacketParserUtils.parsePacketExtension(
payloadElemName, payloadNS, parser));
}
}
}
} }