Make presence parsing more robust

by allowing 'show' to be an empty element: '<show />'
Flowdalic · Aug 28, 2014 · 5a55246 · 5a55246
1 parent 218dc66
commit 5a55246
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
@@ -439,7 +439,18 @@ else if (elementName.equals("priority")) {
                 }
                 else if (elementName.equals("show")) {
                     String modeText = parser.nextText();
-                    presence.setMode(Presence.Mode.fromString(modeText));
+                    if (StringUtils.isNotEmpty(modeText)) {
+                        presence.setMode(Presence.Mode.fromString(modeText));
+                    } else {
+                        // Some implementations send presence stanzas with a
+                        // '<show />' element, which is a invalid XMPP presence
+                        // stanza according to RFC 6121 4.7.2.1
+                        LOGGER.warning("Empty or null mode text in presence show element form "
+                                        + presence.getFrom()
+                                        + " with id '"
+                                        + presence.getPacketID()
+                                        + "' which is invalid according to RFC6121 4.7.2.1");
+                    }
                 }
                 else if (elementName.equals("error")) {
                     presence.setError(parseError(parser));