diff options
author | Olivier CrĂȘte <olivier.crete@collabora.co.uk> | 2010-11-12 13:48:10 -0500 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.co.uk> | 2010-11-17 12:36:19 -0500 |
commit | b04e3969381b215ab72a701d235e312366bbaa74 (patch) | |
tree | 07590f03f0532c13d252342462048a5a941d50d9 | |
parent | 68f32a42602806560ca4e4bea3e3d3d3084f5a09 (diff) |
Don't try to free a possibly NULL member
-rw-r--r-- | telepathy-farsight/stream.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/telepathy-farsight/stream.c b/telepathy-farsight/stream.c index d9287de..cbb2483 100644 --- a/telepathy-farsight/stream.c +++ b/telepathy-farsight/stream.c @@ -1893,13 +1893,15 @@ cb_fs_new_active_candidate_pair (TfStream *self, remote_candidate->port); local_transport = fs_candidate_to_tp_array (local_candidate); - remote_transport = fs_candidate_to_tp_array (remote_candidate); - if (local_transport == NULL || remote_transport == NULL) - { - g_value_array_free (local_transport); - g_value_array_free (remote_transport); + if (!local_transport) return; - } + + remote_transport = fs_candidate_to_tp_array (remote_candidate); + if (!remote_transport) + { + g_value_array_free (local_transport); + return; + } tp_cli_media_stream_handler_call_new_active_transport_pair ( self->priv->stream_handler_proxy, -1, local_candidate->foundation, |