From 15f9c89e8427aa7cdf97061a2bda89d8403e4fba Mon Sep 17 00:00:00 2001 From: Dan Robertson Date: Sun, 11 Feb 2018 20:08:56 +0000 Subject: Fix more leaks - get_parent_pid: free buffer returned from read_line after use. - workspace_for_pid: ensure free_pid_workspace is called when pid_workspaces are removed from config->pid_workspaces. - cmd_split: return the cmd_results from _do_split, so that the parent function may free it. --- common/util.c | 1 + sway/commands/split.c | 9 ++++----- sway/workspace.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/common/util.c b/common/util.c index d6369853..38ac9367 100644 --- a/common/util.c +++ b/common/util.c @@ -96,6 +96,7 @@ pid_t get_parent_pid(pid_t child) { parent = strtol(token, NULL, 10); } + free(buffer); fclose(stat); } diff --git a/sway/commands/split.c b/sway/commands/split.c index e3045a4f..1624eebe 100644 --- a/sway/commands/split.c +++ b/sway/commands/split.c @@ -62,22 +62,21 @@ struct cmd_results *cmd_split(int argc, char **argv) { return error; } if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) { - _do_split(argc - 1, argv + 1, L_VERT); + return _do_split(argc - 1, argv + 1, L_VERT); } else if (strcasecmp(argv[0], "h") == 0 || strcasecmp(argv[0], "horizontal") == 0) { - _do_split(argc - 1, argv + 1, L_HORIZ); + return _do_split(argc - 1, argv + 1, L_HORIZ); } else if (strcasecmp(argv[0], "t") == 0 || strcasecmp(argv[0], "toggle") == 0) { swayc_t *focused = current_container; if (focused->parent->layout == L_VERT) { - _do_split(argc - 1, argv + 1, L_HORIZ); + return _do_split(argc - 1, argv + 1, L_HORIZ); } else { - _do_split(argc - 1, argv + 1, L_VERT); + return _do_split(argc - 1, argv + 1, L_VERT); } } else { error = cmd_results_new(CMD_FAILURE, "split", "Invalid split command (expected either horizontal or vertical)."); return error; } - return cmd_results_new(CMD_SUCCESS, NULL, NULL); } struct cmd_results *cmd_splitv(int argc, char **argv) { diff --git a/sway/workspace.c b/sway/workspace.c index 42525f3d..ab27ff56 100644 --- a/sway/workspace.c +++ b/sway/workspace.c @@ -368,6 +368,7 @@ swayc_t *workspace_for_pid(pid_t pid) { ws = workspace_create(pw->workspace); } + free_pid_workspace(pw); list_del(config->pid_workspaces, i); } -- cgit v1.2.3