Added validation of show values in Presence packets. JM-452

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@3031 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/messenger/net/SocketReader.java

@@ -203,6 +203,7 @@ public abstract class SocketReader implements Runnable {
                     session.process(reply);
                     continue;
                 }
+                // Check that the presence type is valid. If not then assume available type
                 try {
                     packet.getType();
                 }
@@ -212,6 +213,16 @@ public abstract class SocketReader implements Runnable {
                     // an available presence type
                     packet.setType(null);
                 }
+                // Check that the presence show is valid. If not then assume available show value
+                try {
+                    packet.getShow();
+                }
+                catch (IllegalArgumentException e) {
+                    Log.warn("Invalid presence show", e);
+                    // The presence packet contains an invalid presence show so replace it with
+                    // an available presence show
+                    packet.setShow(null);
+                }
                 processPresence(packet);
             }
             else if ("iq".equals(tag)) {