aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-14 21:01:21 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-14 21:01:21 +0100
commitc61120bfc416676147998a435674bf1ac1587359 (patch)
tree9779ae093a66de85922d2caf0dd0fd560f47eeea /src/main/java/eu
parent793671023bd2d05e56ebb5de7ae8a49db7364ffb (diff)
parent2bb68bcbba315aab90b85656c2b08b822a4fa296 (diff)
Merge pull request #664 from squidpickles/development
Added check for empty from on group chat packet
Diffstat (limited to 'src/main/java/eu')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java3
1 files changed, 3 insertions, 0 deletions
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;