luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-22 15:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

GDBusWorker: continue_writing: initialize flush_async_data if closing

Browse Source 
This was a regression in commit f41178c6c: flush_async_data wasn't
necessarily NULL in the "don't flush" case.

Also move initialization of these variables up so that it's
unconditional, since that's easier to verify than checking
that each branch gets it right.

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=664617
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Simon McVittie 2011-11-23 11:20:15 +00:00
parent 1b01109377
commit 968ef5f5ff
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gdbusprivate.c
View File

@ -1441,6 +1441,9 @@ continue_writing (GDBusWorker *worker)
g_mutex_lock (&worker->write_lock); g_mutex_lock (&worker->write_lock);
data = NULL;
flush_async_data = NULL;
/* if we want to close the connection, that takes precedence */ /* if we want to close the connection, that takes precedence */
if (worker->pending_close_attempts != NULL) if (worker->pending_close_attempts != NULL)
{ {
@ -1450,7 +1453,6 @@ continue_writing (GDBusWorker *worker)
g_io_stream_close_async (worker->stream, G_PRIORITY_DEFAULT, g_io_stream_close_async (worker->stream, G_PRIORITY_DEFAULT,
NULL, iostream_close_cb, NULL, iostream_close_cb,
_g_dbus_worker_ref (worker)); _g_dbus_worker_ref (worker));
data = NULL;
} }
else else
{ {
@ -1463,10 +1465,6 @@ continue_writing (GDBusWorker *worker)
if (data != NULL) if (data != NULL)
worker->output_pending = PENDING_WRITE; worker->output_pending = PENDING_WRITE;
} }
else
{
data = NULL;
}
} }
g_mutex_unlock (&worker->write_lock); g_mutex_unlock (&worker->write_lock);