diff options
author | Philip Withnall <pwithnall@endlessos.org> | 2023-02-22 02:40:35 +0000 |
---|---|---|
committer | Philip Withnall <pwithnall@endlessos.org> | 2023-05-09 18:10:16 +0100 |
commit | a218dfea16abb39b87e147ab00d36f0670f72a70 (patch) | |
tree | da1f8722aa4398f9e81843fa1c03e73140dc2f11 | |
parent | 00ae70bffb52a615fd41c1163d0b2861266cb0ea (diff) | |
download | glib-a218dfea16abb39b87e147ab00d36f0670f72a70.tar.gz |
gdbusconnection: Fix double unref on timeout/cancel sending a message
This appears to fix an intermittent failure seen when sending a D-Bus
message with either of a cancellable or a timeout set.
In particular, I can reliably reproduce it with:
```
meson test gdbus-test-codegen-min-required-2-64 --repeat 10000
```
It can be caught easily with asan when reproduced. Tracking down the
location of the refcount mismatch was a little tricky, but was
simplified by replacing a load of `g_object_ref (message)` calls with
`g_dbus_message_copy (message, NULL)` to switch `GDBusMessage` handling
to using copy semantics. This allowed asan to home in on where the
refcount mismatch was happening.
The problem was that `send_message_data_deliver_error()` takes ownership
of the `GTask` passed to it, but the
`send_message_with_replace_cancelled_idle_cb()` and
`send_message_with_reply_timeout_cb()` functions which were calling it,
were not passing in a strong reference as they should have.
Another approach to fixing this would have been to change the transfer
semantics of `send_message_data_deliver_error()` so it was `(transfer
none)` on its `GTask`. That would probably have resulted in cleaner
code, but would have been a lot harder to verify/review the fix, and
easier to inadvertently introduce new bugs.
The fact that the bug was only triggered by the cancellation and timeout
callbacks explains why it was intermittent: these code paths are
typically never hit, but the timeout path may sometimes be hit on a very
slow test run.
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
Fixes: #1264
-rw-r--r-- | gio/gdbusconnection.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c index ccca4e98c..4ad199f81 100644 --- a/gio/gdbusconnection.c +++ b/gio/gdbusconnection.c @@ -1828,7 +1828,7 @@ send_message_data_deliver_reply_unlocked (GTask *task, ; } -/* Called from a user thread, lock is not held */ +/* Called from a user thread, lock is not held; @task is (transfer full) */ static void send_message_data_deliver_error (GTask *task, GQuark domain, @@ -1855,13 +1855,14 @@ send_message_data_deliver_error (GTask *task, /* ---------------------------------------------------------------------------------------------------- */ -/* Called from a user thread, lock is not held; @task is (transfer full) */ +/* Called from a user thread, lock is not held; @task is (transfer none) */ static gboolean send_message_with_reply_cancelled_idle_cb (gpointer user_data) { GTask *task = user_data; - send_message_data_deliver_error (task, G_IO_ERROR, G_IO_ERROR_CANCELLED, + g_object_ref (task); + send_message_data_deliver_error (g_steal_pointer (&task), G_IO_ERROR, G_IO_ERROR_CANCELLED, _("Operation was cancelled")); return G_SOURCE_REMOVE; } @@ -1887,13 +1888,14 @@ send_message_with_reply_cancelled_cb (GCancellable *cancellable, /* ---------------------------------------------------------------------------------------------------- */ -/* Called from a user thread, lock is not held; @task is (transfer full) */ +/* Called from a user thread, lock is not held; @task is (transfer none) */ static gboolean send_message_with_reply_timeout_cb (gpointer user_data) { GTask *task = user_data; - send_message_data_deliver_error (task, G_IO_ERROR, G_IO_ERROR_TIMED_OUT, + g_object_ref (task); + send_message_data_deliver_error (g_steal_pointer (&task), G_IO_ERROR, G_IO_ERROR_TIMED_OUT, _("Timeout was reached")); return FALSE; } |