AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '2657-avoid-use-after-free-suggestion' into 'master'

Browse Source 
Resolve "Use-after-free crash in `thaw_updates()`"

Closes #2657

See merge request GNOME/gtk!1771
This commit is contained in:
Matthias Clasen 2020-04-27 12:16:54 +00:00
commit b3710279bc
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkfilesystemmodel.c
View File

@ -1202,12 +1202,15 @@ gtk_file_system_model_got_files (GObject *object, GAsyncResult *res, gpointer da
}
}
/* Helper for gtk_file_system_model_query_done and
* gtk_file_system_model_one_query_done */
static void
gtk_file_system_model_query_done (GObject * object,
GAsyncResult *res,
gpointer data)
query_done_helper (GObject * object,
GAsyncResult *res,
gpointer data,
gboolean do_thaw_updates)
{
GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */
GtkFileSystemModel *model;
GFile *file = G_FILE (object);
GFileInfo *info;
guint id;
@ -1216,14 +1219,27 @@ gtk_file_system_model_query_done (GObject * object,
if (info == NULL)
return;
model = GTK_FILE_SYSTEM_MODEL (data);
_gtk_file_system_model_update_file (model, file, info);
id = node_get_for_file (model, file);
gtk_file_system_model_sort_node (model, id);
if (do_thaw_updates)
thaw_updates (model);
g_object_unref (info);
}
static void
gtk_file_system_model_query_done (GObject * object,
GAsyncResult *res,
gpointer data)
{
query_done_helper (object, res, data, FALSE);
}
static void
gtk_file_system_model_monitor_change (GFileMonitor * monitor,
GFile * file,
@ -2140,10 +2156,7 @@ gtk_file_system_model_one_query_done (GObject * object,
GAsyncResult *res,
gpointer data)
{
GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */
gtk_file_system_model_query_done (object, res, data);
thaw_updates (model);
query_done_helper (object, res, data, TRUE);
}
void