From b2b6dd3af213a4a22ebcff20269fffdc7e326179 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 28 Feb 2017 10:44:54 +0100 Subject: [PATCH] Avoid possible null dereference If the link fails to resolve the return value will be NULL, so we shouldn't use it before checking for NULL. --- common/flatpak-run.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/flatpak-run.c b/common/flatpak-run.c index 8844e3dd..355d4c1f 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c @@ -2376,10 +2376,12 @@ add_file_args (GPtrArray *argv_array, if (!path_is_visible (keys, n_keys, hash_table, path)) { g_autofree char *resolved = flatpak_resolve_link (path, NULL); - g_autofree char *parent = g_path_get_dirname (path); - g_autofree char *relative = make_relative (parent, resolved); if (resolved) - add_args (argv_array, "--symlink", relative, path, NULL); + { + g_autofree char *parent = g_path_get_dirname (path); + g_autofree char *relative = make_relative (parent, resolved); + add_args (argv_array, "--symlink", relative, path, NULL); + } } } else if (ep->mode == FAKE_MODE_HIDDEN)