AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

file-system-model: Avoid use-after free

Browse Source 
This is a possible fix for https://gitlab.gnome.org/GNOME/gtk/-/issues/2657

Use a NULL return from g_file_query_info_finish() to detect cancellation
of the query, and avoid derferencing a stale pointer.
This commit is contained in:
Peter Bloomfield 2020-04-25 17:26:22 -04:00
parent 7da995da1d
commit d85f02a994
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/gtkfilesystemmodel.c
View File

@ -1202,26 +1202,36 @@ 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 static void
gtk_file_system_model_query_done (GObject * object, query_done_helper (GtkFileSystemModel *model,
GAsyncResult *res, GFile *file,
gpointer data) GFileInfo *info)
{ {
GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */
GFile *file = G_FILE (object);
GFileInfo *info;
guint id; guint id;
info = g_file_query_info_finish (file, res, NULL);
if (info == NULL)
return;
_gtk_file_system_model_update_file (model, file, info); _gtk_file_system_model_update_file (model, file, info);
id = node_get_for_file (model, file); id = node_get_for_file (model, file);
gtk_file_system_model_sort_node (model, id); gtk_file_system_model_sort_node (model, id);
}
g_object_unref (info); static void
gtk_file_system_model_query_done (GObject * object,
GAsyncResult *res,
gpointer data)
{
GFile *file = G_FILE (object);
GFileInfo *info;
info = g_file_query_info_finish (file, res, NULL);
if (info != NULL)
{
query_done_helper (GTK_FILE_SYSTEM_MODEL (data), file, info);
g_object_unref (info);
}
} }
static void static void
@ -2140,10 +2150,19 @@ gtk_file_system_model_one_query_done (GObject * object,
GAsyncResult *res, GAsyncResult *res,
gpointer data) gpointer data)
{ {
GtkFileSystemModel *model = data; /* only a valid pointer if not cancelled */ GFile *file = G_FILE (object);
GFileInfo *info;
gtk_file_system_model_query_done (object, res, data); info = g_file_query_info_finish (file, res, NULL);
thaw_updates (model);
if (info != NULL)
{
GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (data);
query_done_helper (model, file, info);
g_object_unref (info);
thaw_updates (model);
}
} }
void void