diff options
| author | Philip Withnall <withnall@endlessm.com> | 2019-10-28 20:44:07 +0000 |
|---|---|---|
| committer | Philip Withnall <withnall@endlessm.com> | 2019-10-28 20:47:04 +0000 |
| commit | 0c07e672a28f8ee740ac61921c5e86c071909475 (patch) | |
| tree | 06e558ac4fe8e9c142d5cef4f2ab23f154a7567b | |
| parent | 8e32b8e87f855a8d0a1bf8903ff2d0a6ae5fc984 (diff) | |
| download | glib-0c07e672a28f8ee740ac61921c5e86c071909475.tar.gz | |
gdbusserver: Keep a strong reference to the server in callbacks
The `on_run()` function could be executed in any worker thread from the
`GThreadedSocketListener`, but didn’t previously hold a strong reference
to the `GDBusServer`, which meant the server could be finalised in
another thread while `on_run()` was still running.
This was not ideal.
Hold a strong reference to the `GDBusServer` while the socket listener
is listening, i.e. between every paired call to `g_dbus_server_start()`
and `g_dbus_server_stop()`.
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Fixes: #1318
| -rw-r--r-- | gio/gdbusserver.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c index 377ad4456..4a8dab0ea 100644 --- a/gio/gdbusserver.c +++ b/gio/gdbusserver.c @@ -613,6 +613,12 @@ g_dbus_server_start (GDBusServer *server) return; /* Right now we don't have any transport not using the listener... */ g_assert (server->is_using_listener); + server->run_signal_handler_id = g_signal_connect_data (G_SOCKET_SERVICE (server->listener), + "run", + G_CALLBACK (on_run), + g_object_ref (server), + (GClosureNotify) g_object_unref, + 0 /* flags */); g_socket_service_start (G_SOCKET_SERVICE (server->listener)); server->active = TRUE; g_object_notify (G_OBJECT (server), "active"); @@ -1162,15 +1168,7 @@ initable_init (GInitable *initable, if (ret) { - if (last_error != NULL) - g_error_free (last_error); - - /* Right now we don't have any transport not using the listener... */ - g_assert (server->is_using_listener); - server->run_signal_handler_id = g_signal_connect (G_SOCKET_SERVICE (server->listener), - "run", - G_CALLBACK (on_run), - server); + g_clear_error (&last_error); } else { |