From 2bb68bcbba315aab90b85656c2b08b822a4fa296 Mon Sep 17 00:00:00 2001 From: Kevin Rauwolf Date: Fri, 14 Nov 2014 11:40:43 -0800 Subject: Added check for empty from on group chat packet --- src/main/java/eu/siacs/conversations/parser/MessageParser.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/main') diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 6defd91c..bc2db87f 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/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; -- cgit v1.2.3