summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiels De Graef <nielsdegraef@gmail.com>2023-05-16 21:12:42 +0000
committerNiels De Graef <nielsdegraef@gmail.com>2023-05-16 21:12:42 +0000
commite3ac5f762bd5865c3f46e6d43d1afc4630af7190 (patch)
treee6d6a0c046b650a2b646477de584721c4c1719f2
parentb814e464f656f20925311316e776fb41ae3b3d92 (diff)
parent25e1e11c811efa1c1809992f5fe7e3af9e44f7c3 (diff)
downloadlibsecret-master.tar.gz
Merge branch 'mcatanzaro/cancellable-regression' into 'master'HEADmaster
file-backend: avoid critical when cancellable is unset See merge request GNOME/libsecret!120
-rw-r--r--libsecret/secret-file-backend.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libsecret/secret-file-backend.c b/libsecret/secret-file-backend.c
index dd18a5b..825851b 100644
--- a/libsecret/secret-file-backend.c
+++ b/libsecret/secret-file-backend.c
@@ -581,7 +581,8 @@ secret_file_backend_real_init_async (GAsyncInitable *initable,
init = g_new0 (InitClosure, 1);
init->io_priority = io_priority;
init->file = file;
- init->cancellable = g_object_ref (cancellable);
+ if (cancellable)
+ init->cancellable = g_object_ref (cancellable);
g_task_set_task_data (task, init, init_closure_free);
g_bus_get (G_BUS_TYPE_SESSION, cancellable, on_bus_get, task);
} else {