mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-01 19:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix misc memory leaks

Browse source 
This fixes a few misc memory leaks reported by asan:
- Items of `config->config_chain` are now freed instead of just the list
itself
- `bar->swaybar_command` is now freed
- The result returned by a seat subcommand is now returned instead of
leaked
This commit is contained in:
Brian Ashworth 2019-02-11 03:26:12 -05:00 committed by Drew DeVault
parent a4d7ee1923
commit a5a189cc73
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/commands/seat.c
View file

@ -50,5 +50,5 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
} }
config->handler_context.seat_config = NULL; config->handler_context.seat_config = NULL;
return cmd_results_new(CMD_SUCCESS, NULL); return res ? res : cmd_results_new(CMD_SUCCESS, NULL);
} }

2
sway/config.c
View file

@ -118,7 +118,7 @@ void free_config(struct sway_config *config) {
} }
list_free(config->no_focus); list_free(config->no_focus);
list_free(config->active_bar_modifiers); list_free(config->active_bar_modifiers);
list_free(config->config_chain); list_free_items_and_destroy(config->config_chain);
list_free(config->command_policies); list_free(config->command_policies);
list_free(config->feature_policies); list_free(config->feature_policies);
list_free(config->ipc_policies); list_free(config->ipc_policies);

1
sway/config/bar.c
View file

@ -46,6 +46,7 @@ void free_bar_config(struct bar_config *bar) {
free(bar->position); free(bar->position);
free(bar->hidden_state); free(bar->hidden_state);
free(bar->status_command); free(bar->status_command);
free(bar->swaybar_command);
free(bar->font); free(bar->font);
free(bar->separator_symbol); free(bar->separator_symbol);
for (int i = 0; i < bar->bindings->length; i++) { for (int i = 0; i < bar->bindings->length; i++) {