Merge pull request #664 from squidpickles/development

Daniel Gultsch created 11 years ago

Added check for empty from on group chat packet

Change summary

src/main/java/eu/siacs/conversations/parser/MessageParser.java | 3 +++
1 file changed, 3 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -133,6 +133,9 @@ public class MessageParser extends AbstractParser implements
 	private Message parseGroupchat(MessagePacket packet, Account account) {
 		int status;
         final Jid from = packet.getFrom();
+		if (from == null) {
+			return null;
+		}
 		if (mXmppConnectionService.find(account.pendingConferenceLeaves,
 				account, from.toBareJid()) != null) {
 			return null;