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

Merge branch 'fix-exit-crash' into 'main'

Browse source 
client: Free command parser after event loop

Closes #175

See merge request plymouth/plymouth!175
This commit is contained in:
Ray Strode 2022-04-12 23:46:01 +00:00
commit e96011133a
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client/plymouth.c
View file

@ -1219,12 +1219,12 @@ 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);
ply_command_parser_free (state.command_parser);
return exit_code;
}
/* vim: set ts=4 sw=4 expandtab autoindent cindent cino={.5s,(0: */

2
src/libply/ply-command-parser.c
View file

@ -663,8 +663,6 @@ ply_command_parser_get_command_options (ply_command_parser_t *parser,
va_start (args, option_name);
ply_command_parser_get_options_for_command (parser, command, option_name, args);
va_end (args);
ply_list_append_data (parser->available_subcommands, command);
}
static void

4
src/plugins/splash/script/script-lib-plymouth.c
View file

@ -387,6 +387,10 @@ bool script_lib_plymouth_on_validate_input (script_state_t *state,
const char *add_text)
{
bool input_valid;
if (script_obj_is_null (data->script_validate_input_func))
return true;
script_obj_t *entry_text_obj = script_obj_new_string (entry_text);
script_obj_t *add_text_obj = script_obj_new_string (add_text);
script_return_t ret = script_execute_object (state,