mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-31 07:11:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1592 from dlrobertson/fix_mem_errors

Browse source 
Fix more leaks
This commit is contained in:
Drew DeVault 2018-02-11 15:53:13 -05:00 • committed by GitHub
commit ddc8000384
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/util.c
View file

@ -96,6 +96,7 @@ pid_t get_parent_pid(pid_t child) {
parent = strtol(token, NULL, 10); parent = strtol(token, NULL, 10);
} }
free(buffer);
fclose(stat); fclose(stat);
} }

9
sway/commands/split.c
View file

@ -62,22 +62,21 @@ struct cmd_results *cmd_split(int argc, char **argv) {
return error; return error;
} }
if (strcasecmp(argv[0], "v") == 0 || strcasecmp(argv[0], "vertical") == 0) { 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) { } 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) { } else if (strcasecmp(argv[0], "t") == 0 || strcasecmp(argv[0], "toggle") == 0) {
swayc_t *focused = current_container; swayc_t *focused = current_container;
if (focused->parent->layout == L_VERT) { if (focused->parent->layout == L_VERT) {
_do_split(argc - 1, argv + 1, L_HORIZ); return _do_split(argc - 1, argv + 1, L_HORIZ);
} else { } else {
_do_split(argc - 1, argv + 1, L_VERT); return _do_split(argc - 1, argv + 1, L_VERT);
} }
} else { } else {
error = cmd_results_new(CMD_FAILURE, "split", error = cmd_results_new(CMD_FAILURE, "split",
"Invalid split command (expected either horizontal or vertical)."); "Invalid split command (expected either horizontal or vertical).");
return error; return error;
} }
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
} }
struct cmd_results *cmd_splitv(int argc, char **argv) { struct cmd_results *cmd_splitv(int argc, char **argv) {

1
sway/workspace.c
View file

@ -368,6 +368,7 @@ swayc_t *workspace_for_pid(pid_t pid) {
ws = workspace_create(pw->workspace); ws = workspace_create(pw->workspace);
} }
free_pid_workspace(pw);
list_del(config->pid_workspaces, i); list_del(config->pid_workspaces, i);
} }