diff options
| author | Richard Hughes <richard@hughsie.com> | 2022-04-13 14:25:20 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2022-04-13 14:42:28 +0100 |
| commit | be3aa625c10e9f1053c520d2cf849332cb535bd4 (patch) | |
| tree | 84e290120509f89f5fc0bf93f16aca6f1245c11c | |
| parent | f7e487584d1a22ffcfd910e9ae47429599c39b44 (diff) | |
| download | colord-be3aa625c10e9f1053c520d2cf849332cb535bd4.tar.gz | |
trivial: Fix a small memory leak when finding the argyll binaries
| -rw-r--r-- | contrib/session-helper/cd-main.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/contrib/session-helper/cd-main.c b/contrib/session-helper/cd-main.c index 10d94a7..99a85fb 100644 --- a/contrib/session-helper/cd-main.c +++ b/contrib/session-helper/cd-main.c @@ -874,28 +874,24 @@ static gchar * cd_main_find_argyll_tool (const gchar *command, GError **error) { - gboolean ret; - gchar *filename; + g_autofree gchar *filename = NULL; /* try the original argyllcms filename installed in /usr/local/bin */ filename = g_strdup_printf ("/usr/local/bin/%s", command); - ret = g_file_test (filename, G_FILE_TEST_EXISTS); - if (ret) - return filename; + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + return g_steal_pointer(&filename); /* try the debian filename installed in /usr/bin */ g_free (filename); filename = g_strdup_printf ("/usr/bin/argyll-%s", command); - ret = g_file_test (filename, G_FILE_TEST_EXISTS); - if (ret) - return filename; + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + return g_steal_pointer(&filename); /* try the original argyllcms filename installed in /usr/bin */ g_free (filename); filename = g_strdup_printf ("/usr/bin/%s", command); - ret = g_file_test (filename, G_FILE_TEST_EXISTS); - if (ret) - return filename; + if (g_file_test (filename, G_FILE_TEST_EXISTS)) + return g_steal_pointer(&filename); /* eek */ g_set_error (error, |