summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2016-02-10 23:20:39 -0500
committerOlivier CrĂȘte <olivier.crete@collabora.com>2017-06-21 17:08:34 -0400
commit2c50d73b82f2ec2422a8e0ea393194486c193c64 (patch)
tree879d6c0e4065047dae8f0ac0a418c0db4a1a3705
parentdcb0d647174416a292492f8deca86f83a2ef124c (diff)
downloadlibnice-2c50d73b82f2ec2422a8e0ea393194486c193c64.tar.gz
agent: Don't crash if recv cancelled without a GError
-rw-r--r--agent/agent.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/agent/agent.c b/agent/agent.c
index 15af9ed..e48d7f3 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -4279,7 +4279,10 @@ static gboolean
nice_agent_recv_cancelled_cb (GCancellable *cancellable, gpointer user_data)
{
GError **error = user_data;
- return !g_cancellable_set_error_if_cancelled (cancellable, error);
+
+ if (error && *error)
+ g_cancellable_set_error_if_cancelled (cancellable, error);
+ return G_SOURCE_REMOVE;
}
static gint