diff options
| author | Kevin Rauwolf <kevin@blindsight.com> | 2014-11-14 11:40:43 -0800 |
|---|---|---|
| committer | Kevin Rauwolf <kevin@blindsight.com> | 2014-11-14 11:40:43 -0800 |
| commit | 2bb68bcbba315aab90b85656c2b08b822a4fa296 (patch) | |
| tree | 9779ae093a66de85922d2caf0dd0fd560f47eeea /src/main/java/eu/siacs/conversations | |
| parent | 793671023bd2d05e56ebb5de7ae8a49db7364ffb (diff) | |
Added check for empty from on group chat packet
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 3 |
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 6defd91c9..bc2db87fc 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; |