alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

commands/exec: stop truncating >4095-byte commands

Browse source
This commit is contained in:
Manuel Stoeckl 2021-02-02 00:20:15 -05:00 committed by Simon Ser
parent 137dbf3e6d
commit 31b4b96ebf
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sway/commands/exec_always.c
View file

@ -26,7 +26,7 @@ struct cmd_results *cmd_exec_validate(int argc, char **argv) {
struct cmd_results *cmd_exec_process(int argc, char **argv) { struct cmd_results *cmd_exec_process(int argc, char **argv) {
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
char *tmp = NULL; char *cmd = NULL;
if (strcmp(argv[0], "--no-startup-id") == 0) { if (strcmp(argv[0], "--no-startup-id") == 0) {
sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored."); sway_log(SWAY_INFO, "exec switch '--no-startup-id' not supported, ignored.");
--argc; ++argv; --argc; ++argv;
@ -36,17 +36,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
} }
if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) { if (argc == 1 && (argv[0][0] == '\'' || argv[0][0] == '"')) {
tmp = strdup(argv[0]); cmd = strdup(argv[0]);
strip_quotes(tmp); strip_quotes(cmd);
} else { } else {
tmp = join_args(argv, argc); cmd = join_args(argv, argc);
} }
// Put argument into cmd array
char cmd[4096];
strncpy(cmd, tmp, sizeof(cmd) - 1);
cmd[sizeof(cmd) - 1] = 0;
free(tmp);
sway_log(SWAY_DEBUG, "Executing %s", cmd); sway_log(SWAY_DEBUG, "Executing %s", cmd);
int fd[2]; int fd[2];
@ -76,10 +71,12 @@ struct cmd_results *cmd_exec_process(int argc, char **argv) {
close(fd[1]); close(fd[1]);
_exit(0); // Close child process _exit(0); // Close child process
} else if (pid < 0) { } else if (pid < 0) {
free(cmd);
close(fd[0]); close(fd[0]);
close(fd[1]); close(fd[1]);
return cmd_results_new(CMD_FAILURE, "fork() failed"); return cmd_results_new(CMD_FAILURE, "fork() failed");
} }
free(cmd);
close(fd[1]); // close write close(fd[1]); // close write
ssize_t s = 0; ssize_t s = 0;
while ((size_t)s < sizeof(pid_t)) { while ((size_t)s < sizeof(pid_t)) {