luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 01:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

unix-streams: Ensure we get cancelled errors if the cancellable is cancelled

Browse Source
This commit is contained in:
Marco Trevisan (Treviño)
2022-09-13 16:30:12 +02:00
parent d40ef833e3
commit c8e2d4a38d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gio/tests/unix-streams.c
View File

@@ -146,6 +146,7 @@ main_thread_skipped (GObject *source, GAsyncResult *res, gpointer user_data)
if (g_cancellable_is_cancelled (main_cancel)) if (g_cancellable_is_cancelled (main_cancel))
{ {
g_assert_error (err, G_IO_ERROR, G_IO_ERROR_CANCELLED);
do_main_cancel (out); do_main_cancel (out);
g_clear_error (&err); g_clear_error (&err);
return; return;
@@ -181,6 +182,7 @@ main_thread_read (GObject *source, GAsyncResult *res, gpointer user_data)
if (g_cancellable_is_cancelled (main_cancel)) if (g_cancellable_is_cancelled (main_cancel))
{ {
g_assert_error (err, G_IO_ERROR, G_IO_ERROR_CANCELLED);
do_main_cancel (out); do_main_cancel (out);
g_clear_error (&err); g_clear_error (&err);
return; return;
@@ -218,6 +220,7 @@ main_thread_wrote (GObject *source, GAsyncResult *res, gpointer user_data)
if (g_cancellable_is_cancelled (main_cancel)) if (g_cancellable_is_cancelled (main_cancel))
{ {
g_assert_error (err, G_IO_ERROR, G_IO_ERROR_CANCELLED);
do_main_cancel (out); do_main_cancel (out);
g_clear_error (&err); g_clear_error (&err);
return; return;