mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-03-26 10:54:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

main: Return from flatpak_run() instead of calling exit()

Browse Source 
This allows g_autoptr destructors to run, avoiding memory leaks being
reported by AddressSanitizer; they would be harmless, since we're about
to exit anyway, but AddressSanitizer can't tell the difference between
an O(n) problem and an O(1) harmless "leak".

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2024-02-14 23:58:16 +00:00
parent 07ad6af5ac
commit 2350ef1111
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/flatpak-main.c
View File

@@ -711,13 +711,13 @@ flatpak_run (int argc,
if (opt_version)
{
g_print ("%s\n", PACKAGE_STRING);
exit (EXIT_SUCCESS);
return EXIT_SUCCESS;
}
if (opt_default_arch)
{
g_print ("%s\n", flatpak_get_arch ());
exit (EXIT_SUCCESS);
return EXIT_SUCCESS;
}
if (opt_supported_arches)
@@ -726,7 +726,7 @@ flatpak_run (int argc,
int i;
for (i = 0; arches[i] != NULL; i++)
g_print ("%s\n", arches[i]);
exit (EXIT_SUCCESS);
return EXIT_SUCCESS;
}
if (opt_gl_drivers)
@@ -735,7 +735,7 @@ flatpak_run (int argc,
int i;
for (i = 0; drivers[i] != NULL; i++)
g_print ("%s\n", drivers[i]);
exit (EXIT_SUCCESS);
return EXIT_SUCCESS;
}
if (opt_list_installations)
@@ -751,7 +751,7 @@ flatpak_run (int argc,
GFile *file = paths->pdata[i];
g_print ("%s\n", flatpak_file_get_path_cached (file));
}
exit (EXIT_SUCCESS);
return EXIT_SUCCESS;
}
}
@@ -777,7 +777,7 @@ flatpak_run (int argc,
if (local_error != NULL)
{
g_printerr ("%s\n", local_error->message);
exit (1);
return 1;
}
for (gsize i = 0; i < system_installation_locations->len; i++)
@@ -805,7 +805,7 @@ flatpak_run (int argc,
new_dirs_joined = g_strjoinv (":", (gchar **) new_dirs->pdata);
g_print ("XDG_DATA_DIRS=%s\n", new_dirs_joined);
exit (EXIT_SUCCESS);
return EXIT_SUCCESS;
}
}