fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 14:18:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

client: call cleanup functions everytime we return from main

Browse source 
We were not cleaning up allocated resources in many of the code
execution paths in main()
This commit is contained in:
Eric Curtin 2022-03-28 15:52:49 +01:00 • committed by Ray Strode
parent bce1856745
commit ed7b1690f0
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client/plymouth.c
View file

@ -1065,7 +1065,8 @@ main (int argc,
ply_error ("%s", help_string);
free (help_string);
return 1;
exit_code = 1;
goto out;
}
ply_command_parser_get_options (state.command_parser,
@ -1097,7 +1098,7 @@ main (int argc,
printf ("%s", help_string);
free (help_string);
return 0;
goto out;
}
if (ply_kernel_command_line_has_argument ("plymouth.debug") && !ply_is_tracing ())
@ -1108,7 +1109,7 @@ main (int argc,
if (should_get_plugin_path) {
printf ("%s\n", PLYMOUTH_PLUGIN_PATH);
return 0;
goto out;
}
is_connected = ply_boot_client_connect (state.client,
@ -1119,15 +1120,17 @@ main (int argc,
if (should_ping) {
ply_trace ("ping failed");
return 1;
exit_code = 1;
goto out;
}
if (should_check_for_active_vt) {
ply_trace ("has active vt? failed");
return 1;
exit_code = 1;
goto out;
}
if (should_wait) {
ply_trace ("no need to wait");
return 0;
goto out;
}
}
@ -1215,6 +1218,9 @@ main (int argc,
exit_code = ply_event_loop_run (state.loop);
out:
ply_command_parser_free (state.command_parser);
ply_boot_client_free (state.client);
ply_event_loop_free (state.loop);