diff options
| author | emersion <contact@emersion.fr> | 2018-07-15 22:09:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-15 22:09:04 +0100 |
| commit | b314a8f2cc792aa59d8f12e5adb9aed2967af646 (patch) | |
| tree | 74468af2643af7ad9315fb983acad8b8f69f8c4b | |
| parent | 87334dbccb2c00ab72e96d4b58cf128dfbf8f751 (diff) | |
| parent | 9559e3e2afeabc5fd68ee0679ad9b5745c92425b (diff) | |
| download | sway-b314a8f2cc792aa59d8f12e5adb9aed2967af646.tar.xz | |
Merge pull request #2280 from ianyfan/leaks
Fix some memory leaks
| -rw-r--r-- | sway/commands/bar/position.c | 1 | ||||
| -rw-r--r-- | sway/config.c | 1 | ||||
| -rw-r--r-- | sway/config/output.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/sway/commands/bar/position.c b/sway/commands/bar/position.c index 48e7ddbd..44bb4ae3 100644 --- a/sway/commands/bar/position.c +++ b/sway/commands/bar/position.c @@ -17,6 +17,7 @@ struct cmd_results *bar_cmd_position(int argc, char **argv) { if (strcasecmp(valid[i], argv[0]) == 0) { wlr_log(WLR_DEBUG, "Setting bar position '%s' for bar: %s", argv[0], config->current_bar->id); + free(config->current_bar->position); config->current_bar->position = strdup(argv[0]); return cmd_results_new(CMD_SUCCESS, NULL, NULL); } diff --git a/sway/config.c b/sway/config.c index 2c051146..f63835bf 100644 --- a/sway/config.c +++ b/sway/config.c @@ -474,6 +474,7 @@ static bool load_include_config(const char *path, const char *parent_dir, list_del(config->config_chain, index); return false; } + free(real_path); // restore current_config_path config->current_config_path = parent_config; diff --git a/sway/config/output.c b/sway/config/output.c index 205e2633..1bf9e5f1 100644 --- a/sway/config/output.c +++ b/sway/config/output.c @@ -207,6 +207,8 @@ void apply_output_config(struct output_config *oc, struct sway_container *output output->sway_output->bg_pid = fork(); if (output->sway_output->bg_pid == 0) { execvp(cmd[0], cmd); + } else { + free(command); } } if (oc && oc->dpms_state != DPMS_IGNORE) { |