diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2009-04-11 13:01:55 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2009-04-11 13:01:55 +0300 |
| commit | 768e771ab5659f76469d676b09314f42bc93b6fa (patch) | |
| tree | f1a786444bb3e8facb8ee8c99c2b904dac1ea02c | |
| parent | 77d8d1ca1a56b23b93f511efe8b0a7d1b0c6905d (diff) | |
| download | obexd-768e771ab5659f76469d676b09314f42bc93b6fa.tar.gz | |
Don't call dbus_pending_call_cancel if we got a reply
Calling dbus_pending_call_cancel when we already got a reply might trigger a
double-unref on the libdbus side, so don't do this.
| -rw-r--r-- | src/manager.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/manager.c b/src/manager.c index 0abab9c..2c2768d 100644 --- a/src/manager.c +++ b/src/manager.c @@ -833,6 +833,9 @@ static void agent_reply(DBusPendingCall *call, gpointer user_data) DBusMessage *reply = dbus_pending_call_steal_reply(call); const gchar *name; DBusError derr; + gboolean *got_reply = user_data; + + *got_reply = TRUE; /* Received a reply after the agent exited */ if (!agent) @@ -870,17 +873,8 @@ static void agent_reply(DBusPendingCall *call, gpointer user_data) static gboolean auth_error(GIOChannel *io, GIOCondition cond, gpointer user_data) { - DBusMessage *msg; - agent->auth_pending = FALSE; - msg = dbus_message_new_method_call(agent->bus_name, agent->path, - "org.openobex.Agent", "Cancel"); - - dbus_connection_send_with_reply(connection, msg, NULL, -1); - - dbus_message_unref(msg); - return FALSE; } @@ -897,6 +891,7 @@ int request_authorization(gint32 cid, int fd, const gchar *filename, const gchar *bda = address; gchar *path; guint watch; + gboolean got_reply; if (!agent) return -1; @@ -940,6 +935,7 @@ int request_authorization(gint32 cid, int fd, const gchar *filename, dbus_message_unref(msg); agent->auth_pending = TRUE; + got_reply = FALSE; /* Catches errors before authorization response comes */ io = g_io_channel_unix_new(fd); @@ -948,7 +944,7 @@ int request_authorization(gint32 cid, int fd, const gchar *filename, auth_error, NULL, NULL); g_io_channel_unref(io); - dbus_pending_call_set_notify(call, agent_reply, NULL, NULL); + dbus_pending_call_set_notify(call, agent_reply, &got_reply, NULL); /* Workaround: process events while agent doesn't reply */ while (agent && agent->auth_pending) @@ -956,7 +952,15 @@ int request_authorization(gint32 cid, int fd, const gchar *filename, g_source_remove(watch); - dbus_pending_call_cancel(call); + if (!got_reply) { + dbus_pending_call_cancel(call); + msg = dbus_message_new_method_call(agent->bus_name, + agent->path, + "org.openobex.Agent", + "Cancel"); + g_dbus_send_message(connection, msg); + } + dbus_pending_call_unref(call); if (!agent || !agent->new_name) |