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

subprocess: Fix communicate_cancelled signature

Browse Source 
The source callback for a GCancellable should have the cancellable itself
as first argument.
This was not the case, and when this code was hit, we were instead trying
to treat the pointer as a CommunicateState reference and thus wrongly
deferencing it, causing a memory error and a crash.
This commit is contained in:
Marco Trevisan (Treviño) 2018-08-24 06:05:03 +02:00
parent f2504be625
commit 5cc4cca9c6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/gsubprocess.c
View File

@ -1528,7 +1528,8 @@ g_subprocess_communicate_made_progress (GObject *source_object,
} }
static gboolean static gboolean
g_subprocess_communicate_cancelled (gpointer user_data) g_subprocess_communicate_cancelled (GCancellable *cancellable,
gpointer user_data)
{ {
CommunicateState *state = user_data; CommunicateState *state = user_data;
@ -1580,7 +1581,9 @@ g_subprocess_communicate_internal (GSubprocess *subprocess,
{ {
state->cancellable_source = g_cancellable_source_new (cancellable); state->cancellable_source = g_cancellable_source_new (cancellable);
/* No ref held here, but we unref the source from state's free function */ /* No ref held here, but we unref the source from state's free function */
g_source_set_callback (state->cancellable_source, g_subprocess_communicate_cancelled, state, NULL); g_source_set_callback (state->cancellable_source,
G_SOURCE_FUNC (g_subprocess_communicate_cancelled),
state, NULL);
g_source_attach (state->cancellable_source, g_main_context_get_thread_default ()); g_source_attach (state->cancellable_source, g_main_context_get_thread_default ());
} }