aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/utils
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-31 09:45:39 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-31 09:45:39 +0200
commit6bb7764d723f6fcaba7ec5e85d8404e28ca52fda (patch)
treed9b242c00ccbc90057cabcdb804907c63ca4ea9f /src/eu/siacs/conversations/utils
parent92e07133731c53689284bea108c91f06bf76b7e3 (diff)
null pointer fix
Diffstat (limited to 'src/eu/siacs/conversations/utils')
-rw-r--r--src/eu/siacs/conversations/utils/MessageParser.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/utils/MessageParser.java b/src/eu/siacs/conversations/utils/MessageParser.java
index 4bdb2539d..936d0e9a5 100644
--- a/src/eu/siacs/conversations/utils/MessageParser.java
+++ b/src/eu/siacs/conversations/utils/MessageParser.java
@@ -133,6 +133,9 @@ public class MessageParser {
} else {
return null;
}
+ if (forwarded==null) {
+ return null;
+ }
Element message = forwarded.findChild("message");
if ((message == null) || (!message.hasChild("body")))
return null; // either malformed or boring