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

Merge branch 'wip/carlosg/cancel-local-file-enumeration' into 'main'

Browse Source 
gio: Check cancellable iterating local file enumerator

See merge request GNOME/glib!3438
This commit is contained in:
Marco Trevisan 2023-05-19 13:42:42 +00:00
commit 13536dc68d
2 changed files with 36 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 <glib.h>
#include <gcancellable.h>
#include <glocalfileenumerator.h>
#include <glocalfileinfo.h>
#include <glocalfile.h>
@ -383,6 +384,9 @@ g_local_file_enumerator_next_file (GFileEnumerator *enumerator,
next_file:
if (g_cancellable_set_error_if_cancelled (cancellable, error))
return NULL;
#ifdef USE_GDIR
filename = g_dir_read_name (local->dir);
file_type = G_FILE_TYPE_UNKNOWN;

32
gio/tests/file.c
View File

@ -3888,6 +3888,37 @@ test_query_default_handler_uri_async (void)
g_object_unref (invalid_file);
}
static void
test_enumerator_cancellation (void)
{
GCancellable *cancellable;
GFileEnumerator *enumerator;
GFileInfo *info;
GFile *dir;
GError *error = NULL;
dir = g_file_new_for_path (g_get_tmp_dir ());
g_assert_nonnull (dir);
enumerator = g_file_enumerate_children (dir,
G_FILE_ATTRIBUTE_STANDARD_NAME,
G_FILE_QUERY_INFO_NONE,
NULL,
&error);
g_assert_nonnull (enumerator);
cancellable = g_cancellable_new ();
g_cancellable_cancel (cancellable);
info = g_file_enumerator_next_file (enumerator, cancellable, &error);
g_assert_null (info);
g_assert_error (error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
g_error_free (error);
g_object_unref (cancellable);
g_object_unref (enumerator);
g_object_unref (dir);
}
int
main (int argc, char *argv[])
{
@ -3941,6 +3972,7 @@ main (int argc, char *argv[])
g_test_add_func ("/file/query-default-handler-file-async", test_query_default_handler_file_async);
g_test_add_func ("/file/query-default-handler-uri", test_query_default_handler_uri);
g_test_add_func ("/file/query-default-handler-uri-async", test_query_default_handler_uri_async);
g_test_add_func ("/file/enumerator-cancellation", test_enumerator_cancellation);
return g_test_run ();
}