luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-05 17:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

gio: Check cancellable iterating local file enumerator

Browse Source 
In the typical `while (g_file_enumerator_next_file ())` patterns,
there is nothing much checking whether the operation was cancelled
on the GIO side. Unless the user checks for the case, this means
local enumerators always run to completion even if cancelled.

Fix this by checking the cancellable state explicitly for local
enumerators, so there are oportunities for bailing out early if
the enumerator is going through a very large directory.
This commit is contained in:
Carlos Garnacho 2023-05-19 12:54:47 +02:00
parent eaaa2b5f66
commit 99571c42d5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/glocalfileenumerator.c
View File

@ -23,6 +23,7 @@
#include "config.h" #include "config.h"
#include <glib.h> #include <glib.h>
#include <gcancellable.h>
#include <glocalfileenumerator.h> #include <glocalfileenumerator.h>
#include <glocalfileinfo.h> #include <glocalfileinfo.h>
#include <glocalfile.h> #include <glocalfile.h>
@ -383,6 +384,9 @@ g_local_file_enumerator_next_file (GFileEnumerator *enumerator,
next_file: next_file:
if (g_cancellable_set_error_if_cancelled (cancellable, error))
return NULL;
#ifdef USE_GDIR #ifdef USE_GDIR
filename = g_dir_read_name (local->dir); filename = g_dir_read_name (local->dir);
file_type = G_FILE_TYPE_UNKNOWN; file_type = G_FILE_TYPE_UNKNOWN;