applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

night-ligth-dialog: Avoid dereferencing invalid pointer

Browse source 
dialog_got_proxy_cb and dialog_got_proxy_props_cb may be called after the
instance of CcNightLightDialog has been disposed. Make sure 'self' pointer is
not dereferenced if not valid.

Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/86
This commit is contained in:
Andrea Azzarone 2018-05-07 21:11:27 +02:00
parent 6ec0bcde15
commit 1d26f63b18
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
panels/display/cc-night-light-dialog.c
View file

@ -386,13 +386,18 @@ static void
dialog_got_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) dialog_got_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
{ {
CcNightLightDialog *self = (CcNightLightDialog *) user_data; CcNightLightDialog *self = (CcNightLightDialog *) user_data;
GDBusProxy *proxy;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
self->proxy_color = cc_object_storage_create_dbus_proxy_finish (res, &error);
if (self->proxy_color == NULL) proxy = cc_object_storage_create_dbus_proxy_finish (res, &error);
if (proxy == NULL)
{ {
g_warning ("failed to connect to g-s-d: %s", error->message); g_warning ("failed to connect to g-s-d: %s", error->message);
return; return;
} }
self->proxy_color = proxy;
g_signal_connect_object (self->proxy_color, "g-properties-changed", g_signal_connect_object (self->proxy_color, "g-properties-changed",
G_CALLBACK (dialog_color_properties_changed_cb), self, 0); G_CALLBACK (dialog_color_properties_changed_cb), self, 0);
dialog_update_state (self); dialog_update_state (self);
@ -403,13 +408,17 @@ static void
dialog_got_proxy_props_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) dialog_got_proxy_props_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
{ {
CcNightLightDialog *self = (CcNightLightDialog *) user_data; CcNightLightDialog *self = (CcNightLightDialog *) user_data;
GDBusProxy *proxy;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
self->proxy_color_props = cc_object_storage_create_dbus_proxy_finish (res, &error);
if (self->proxy_color_props == NULL) proxy = cc_object_storage_create_dbus_proxy_finish (res, &error);
if (proxy == NULL)
{ {
g_warning ("failed to connect to g-s-d: %s", error->message); g_warning ("failed to connect to g-s-d: %s", error->message);
return; return;
} }
self->proxy_color_props = proxy;
} }
static gboolean static gboolean