luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-25 21:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-unix-streams-error-leak' into 'main'

Browse Source 
tests/unix-streams: Free the cancelled error on cancelled cancellable

See merge request GNOME/glib!2892
This commit is contained in:
Philip Withnall 2022-10-10 12:02:56 +00:00
commit 1d2ea6518c
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/tests/unix-streams.c
View File

@ -146,7 +146,9 @@ 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);
return; return;
} }
@ -180,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;
@ -217,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;