luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 16:32:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cancellable-cancel-null' into 'master'

Browse Source 
gcancellable: add back lost NULL check in g_cancellable_cancel()

Closes #1710

See merge request GNOME/glib!707
This commit is contained in:
Philip Withnall
2019-03-05 16:06:29 +00:00
parent aeb7dbad30 e13c646465
commit 35db2ffe9c
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gcancellable.c
View File

@@ -484,7 +484,7 @@ g_cancellable_cancel (GCancellable *cancellable)
{
GCancellablePrivate *priv;
if (g_cancellable_is_cancelled (cancellable))
if (cancellable == NULL || g_cancellable_is_cancelled (cancellable))
return;
priv = cancellable->priv;

7
gio/tests/cancellable.c
View File

@@ -216,12 +216,19 @@ test_cancel_multiple_concurrent (void)
g_main_loop_unref (loop);
}
static void
test_cancel_null (void)
{
g_cancellable_cancel (NULL);
}
int
main (int argc, char *argv[])
{
g_test_init (&argc, &argv, NULL);
g_test_add_func ("/cancellable/multiple-concurrent", test_cancel_multiple_concurrent);
g_test_add_func ("/cancellable/null", test_cancel_null);
return g_test_run ();
}