aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-11-07 21:38:22 +0100
committerChristian Schneppe <christian@pix-art.de>2016-11-07 21:38:22 +0100
commit8baeaed457aaee5539b341d94ef74a432fae9277 (patch)
treebcec02a961e831038b7d61bc0ba7e85f8c138c3a /src/main/java/de
parente935c7e8f5d2e8afa235af102d02211173ba0039 (diff)
fixed npe when jingle partner is using unknown candidate
Diffstat (limited to 'src/main/java/de')
-rw-r--r--src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
index 6db0b9787..5417b8deb 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
@@ -624,6 +624,10 @@ public class JingleConnection implements Transferable {
if (cid != null) {
Log.d(Config.LOGTAG, "candidate used by counterpart:" + cid);
JingleCandidate candidate = getCandidate(cid);
+ if (candidate == null) {
+ Log.d(Config.LOGTAG,"could not find candidate with cid="+cid);
+ return false;
+ }
candidate.flagAsUsedByCounterpart();
this.receivedCandidate = true;
if ((mJingleStatus == JINGLE_STATUS_ACCEPTED)