luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 10:07:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

GDBusWorker: if a read was cancelled it means we closed the connection

Browse Source 
This was a regression caused by my previous work on GDBusWorker thread-safety
(Bug #651268). The symptom is that if you disconnect a GDBusConnection
locally, the default implementation of GDBusConnection::closed
terminates your process, even though it shouldn't do that for
locally-closed connections; this is because GDBusWorker didn't think a
cancelled read was a local close.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=662100
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Simon McVittie
2011-10-18 15:21:38 +01:00
parent 4cf6ec036e
commit ac2c49f313
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gio/gdbusprivate.c
View File

@@ -704,7 +704,11 @@ _g_dbus_worker_do_read_cb (GInputStream *input_stream,
if (bytes_read == -1) if (bytes_read == -1)
{ {
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
_g_dbus_worker_emit_disconnected (worker, FALSE, NULL);
else
_g_dbus_worker_emit_disconnected (worker, TRUE, error); _g_dbus_worker_emit_disconnected (worker, TRUE, error);
g_error_free (error); g_error_free (error);
goto out; goto out;
} }