[next] telepathy-glib: tp-fs: fix a potential NULL dereferencing crash

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Tue May 27 01:24:20 PDT 2014


Module: telepathy-glib
Branch: next
Commit: 90408bfe036fba0fb2d00fe16aeb30cf8d335e7e
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=90408bfe036fba0fb2d00fe16aeb30cf8d335e7e

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed May 21 10:48:01 2014 +0200

tp-fs: fix a potential NULL dereferencing crash

https://bugs.freedesktop.org/show_bug.cgi?id=79006

---

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

diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index 46ed90b..86a3dfe 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -331,7 +331,8 @@ _tf_call_stream_push_remote_candidates (TfCallStream *self,
       tf_call_stream_fail (self,
           TP_CALL_STATE_CHANGE_REASON_INTERNAL_ERROR,
           TP_ERROR_STR_MEDIA_STREAMING_ERROR,
-          "Error setting the remote candidates: %s", error->message);
+          "Error setting the remote candidates: %s",
+          error != NULL ? error->message : "invalid transport type");
       g_clear_error (&error);
     }
   fs_candidate_list_destroy (fscandidates);



More information about the telepathy-commits mailing list