From e24503a8e9a9125e4471b89cc5ea0b881579c066 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 2 Jul 2019 12:08:45 +0100 Subject: [PATCH] gvfs: Add an assertion to check that get_file_for_uri() is never NULL It cannot return a NULL value, as none of its callers have error handlng. Add an assertion to check the values returned by the VFS implementations. Signed-off-by: Philip Withnall Helps: #1819 --- gio/gvfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gio/gvfs.c b/gio/gvfs.c index 5805a7904..3475624cf 100644 --- a/gio/gvfs.c +++ b/gio/gvfs.c @@ -236,7 +236,7 @@ g_vfs_get_file_for_uri (GVfs *vfs, const char *uri) { GVfsClass *class; - GFile *ret; + GFile *ret = NULL; g_return_val_if_fail (G_IS_VFS (vfs), NULL); g_return_val_if_fail (uri != NULL, NULL); @@ -244,10 +244,12 @@ g_vfs_get_file_for_uri (GVfs *vfs, class = G_VFS_GET_CLASS (vfs); ret = get_file_for_uri_internal (vfs, uri); - if (ret) - return ret; + if (!ret) + ret = (* class->get_file_for_uri) (vfs, uri); - return (* class->get_file_for_uri) (vfs, uri); + g_assert (ret != NULL); + + return g_steal_pointer (&ret); } /**