From 6064ed5181087387cf325dcfcd977d18fb3ce3a7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Sep 2015 01:50:51 -0400 Subject: [PATCH] places view: Avoid a crash in finalize When the places view is finalized before the network loading is finished, the async operation is cancelled, and the callback accesses the places view while it is already in a state of disrepair. Avoid that access. --- gtk/gtkplacesview.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c index a2a8395a47..5fa3c39efa 100644 --- a/gtk/gtkplacesview.c +++ b/gtk/gtkplacesview.c @@ -992,11 +992,8 @@ network_enumeration_finished (GObject *source_object, { GtkPlacesViewPrivate *priv; GFileEnumerator *enumerator; - GtkPlacesView *view; GError *error; - view = GTK_PLACES_VIEW (user_data); - priv = gtk_places_view_get_instance_private (view); error = NULL; enumerator = g_file_enumerate_children_finish (G_FILE (source_object), res, &error); @@ -1010,6 +1007,7 @@ network_enumeration_finished (GObject *source_object, } else { + priv = gtk_places_view_get_instance_private (GTK_PLACES_VIEW (user_data)); g_file_enumerator_next_files_async (enumerator, G_MAXINT32, G_PRIORITY_DEFAULT,