telepathy-farstream: call-stream: Ignore local candidates if there are none

Olivier Crête tester at kemper.freedesktop.org
Thu Mar 6 09:21:41 PST 2014


Module: telepathy-farstream
Branch: master
Commit: 0ca4ba4c593df911bb491dfdce4ccccd77118167
URL:    http://cgit.freedesktop.org/telepathy/telepathy-farstream/commit/?id=0ca4ba4c593df911bb491dfdce4ccccd77118167

Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Thu Mar  6 10:33:04 2014 -0500

call-stream: Ignore local candidates if there are none

Otherwise it will call add_candidates() with NULL which triggers
a ICE restart.

---

 telepathy-farstream/call-stream.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index 9713dec..b1d21ec 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -307,6 +307,10 @@ _tf_call_stream_push_remote_candidates (TfCallStream *self,
   gboolean ret;
   GError *error = NULL;
 
+  /* If there are no candidates, nothing to do, just return */
+  if (fscandidates == NULL)
+    return;
+
   switch (self->transport_type)
     {
     case TP_STREAM_TRANSPORT_TYPE_RAW_UDP:



More information about the telepathy-commits mailing list