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

Merge pull request #2280 from ianyfan/leaks

Browse source 
Fix some memory leaks
This commit is contained in:
emersion 2018-07-15 22:09:04 +01:00 committed by GitHub
commit b314a8f2cc
Failed to generate hash of commit
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/commands/bar/position.c
View file

@ -17,6 +17,7 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) {
if (strcasecmp(valid[i], argv[0]) == 0) { if (strcasecmp(valid[i], argv[0]) == 0) {
wlr_log(WLR_DEBUG, "Setting bar position '%s' for bar: %s", wlr_log(WLR_DEBUG, "Setting bar position '%s' for bar: %s",
argv[0], config->current_bar->id); argv[0], config->current_bar->id);
free(config->current_bar->position);
config->current_bar->position = strdup(argv[0]); config->current_bar->position = strdup(argv[0]);
return cmd_results_new(CMD_SUCCESS, NULL, NULL); return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }

1
sway/config.c
View file

@ -474,6 +474,7 @@ static bool load_include_config(const char *path, const char *parent_dir,
list_del(config->config_chain, index); list_del(config->config_chain, index);
return false; return false;
} }
free(real_path);
// restore current_config_path // restore current_config_path
config->current_config_path = parent_config; config->current_config_path = parent_config;

2
sway/config/output.c
View file

@ -207,6 +207,8 @@ void apply_output_config(struct output_config *oc, struct sway_container *output
output->sway_output->bg_pid = fork(); output->sway_output->bg_pid = fork();
if (output->sway_output->bg_pid == 0) { if (output->sway_output->bg_pid == 0) {
execvp(cmd[0], cmd); execvp(cmd[0], cmd);
} else {
free(command);
} }
} }
if (oc && oc->dpms_state != DPMS_IGNORE) { if (oc && oc->dpms_state != DPMS_IGNORE) {