From cb9c00d2883a3497fb74bb9c3b64c609f0310d77 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 2 May 2018 20:40:28 +0200
Subject: do not crash when inner message contains invalid jid

---
 src/main/java/de/pixart/messenger/parser/MessageParser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java
index 5e307531f..c72af97aa 100644
--- a/src/main/java/de/pixart/messenger/parser/MessageParser.java
+++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java
@@ -396,8 +396,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
         }
         boolean notify = false;
 
-        if (from == null) {
-            Log.d(Config.LOGTAG, "no from in: " + packet.toString());
+        if (from == null || !InvalidJid.isValid(from) || !InvalidJid.isValid(to)) {
+            Log.e(Config.LOGTAG, "encountered invalid message from='" + from + "' to='" + to + "'");
             return;
         }
 
-- 
cgit v1.2.3