Miroirs/sway-patched-tray-menu-github
1
0
Fork 0
mirror of https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git synced 2024-12-26 21:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix segfaults caused by faulty command parsing

Browse source 
This patch fixes faulty command parsing introduced by
f0f5de9a9e. When that commit allowed
criteria reset on ';' delimeters in commands lists, it failed to account
for its inner ','-parsing loop eating threw the entire rest of the
string.

This patch refactors argsep to use a list of multiple separators, and
(optionally) return the separator that it matched against in this
iteration via a pointer. This allows it to hint at the command parser
which separator was used at the end of the last command, allowing it to
trigger a potential secondary read of the criteria.

Fixes #4239
This commit is contained in:
Matt Coffin 2019-06-11 12:10:17 -06:00 committed by Brian Ashworth
parent 3f77591b00
commit 2b5bf78faf
4 changed files with 106 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
common/stringop.c
View file

@ -251,37 +251,61 @@ char *join_args(char **argv, int argc) {
return res; return res;
} }
char *argsep(char **stringp, const char *delim) { static inline char *argsep_next_interesting(const char *src, const char *delim) {
char *special = strpbrk(src, "\"'\\");
char *next_delim = strpbrk(src, delim);
if (!special) {
return next_delim;
}
if (!next_delim) {
return special;
}
return (next_delim < special) ? next_delim : special;
}
char *argsep(char **stringp, const char *delim, char *matched) {
char *start = *stringp; char *start = *stringp;
char *end = start; char *end = start;
bool in_string = false; bool in_string = false;
bool in_char = false; bool in_char = false;
bool escaped = false; bool escaped = false;
while (1) { char *interesting = NULL;
if (*end == '"' && !in_char && !escaped) {
in_string = !in_string; while ((interesting = argsep_next_interesting(end, delim))) {
} else if (*end == '\'' && !in_string && !escaped) { if (escaped && interesting != end) {
in_char = !in_char;
} else if (*end == '\\') {
escaped = !escaped;
} else if (*end == '\0') {
*stringp = NULL;
break;
} else if (!in_string && !in_char && !escaped && strchr(delim, *end)) {
if (end - start) {
*(end++) = 0;
*stringp = end + strspn(end, delim);;
if (!**stringp) *stringp = NULL;
break;
} else {
++start;
end = start;
}
}
if (*end != '\\') {
escaped = false; escaped = false;
} }
++end; if (*interesting == '"' && !in_char && !escaped) {
in_string = !in_string;
end = interesting + 1;
} else if (*interesting == '\'' && !in_string && !escaped) {
in_char = !in_char;
end = interesting + 1;
} else if (*interesting == '\\') {
escaped = !escaped;
end = interesting + 1;
} else if (!in_string && !in_char && !escaped) {
// We must have matched a separator
end = interesting;
if (matched) {
*matched = *end;
}
if (end - start) {
*(end++) = 0;
*stringp = end;
break;
} else {
end = ++start;
}
} else {
end++;
}
}
if (!interesting) {
*stringp = NULL;
if (matched) {
*matched = '\0';
}
} }
return start; return start;
} }

2
include/stringop.h
View file

@ -24,6 +24,6 @@ int unescape_string(char *string);
char *join_args(char **argv, int argc); char *join_args(char **argv, int argc);
// Split string into 2 by delim, handle quotes // Split string into 2 by delim, handle quotes
char *argsep(char **stringp, const char *delim); char *argsep(char **stringp, const char *delim, char *matched_delim);
#endif #endif

113
sway/commands.c
View file

@ -211,8 +211,8 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
list_t *res_list = create_list(); list_t *res_list = create_list();
char *exec = strdup(_exec); char *exec = strdup(_exec);
char *head = exec; char *head = exec;
char *cmdlist;
char *cmd; char *cmd;
char matched_delim = ';';
list_t *views = NULL; list_t *views = NULL;
if (seat == NULL) { if (seat == NULL) {
@ -227,16 +227,13 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
head = exec; head = exec;
do { do {
// Split command list for (; isspace(*head); ++head) {}
cmdlist = argsep(&head, ";"); // Extract criteria (valid for this command list only).
do { if (matched_delim == ';') {
// Skip leading whitespace
for (; isspace(*cmdlist); ++cmdlist) {}
// Extract criteria (valid for this command chain only).
config->handler_context.using_criteria = false; config->handler_context.using_criteria = false;
if (*cmdlist == '[') { if (*head == '[') {
char *error = NULL; char *error = NULL;
struct criteria *criteria = criteria_parse(cmdlist, &error); struct criteria *criteria = criteria_parse(head, &error);
if (!criteria) { if (!criteria) {
list_add(res_list, list_add(res_list,
cmd_results_new(CMD_INVALID, "%s", error)); cmd_results_new(CMD_INVALID, "%s", error));
@ -245,71 +242,71 @@ list_t *execute_command(char *_exec, struct sway_seat *seat,
} }
list_free(views); list_free(views);
views = criteria_get_views(criteria); views = criteria_get_views(criteria);
cmdlist += strlen(criteria->raw); head += strlen(criteria->raw);
criteria_destroy(criteria); criteria_destroy(criteria);
config->handler_context.using_criteria = true; config->handler_context.using_criteria = true;
// Skip leading whitespace // Skip leading whitespace
for (; isspace(*cmdlist); ++cmdlist) {} for (; isspace(*head); ++head) {}
} }
// Split command chain into commands }
cmd = argsep(&cmdlist, ","); // Split command list
for (; isspace(*cmd); ++cmd) {} cmd = argsep(&head, ";,", &matched_delim);
if (strcmp(cmd, "") == 0) { for (; isspace(*cmd); ++cmd) {}
sway_log(SWAY_INFO, "Ignoring empty command.");
continue; if (strcmp(cmd, "") == 0) {
} sway_log(SWAY_INFO, "Ignoring empty command.");
sway_log(SWAY_INFO, "Handling command '%s'", cmd); continue;
//TODO better handling of argv }
int argc; sway_log(SWAY_INFO, "Handling command '%s'", cmd);
char **argv = split_args(cmd, &argc); //TODO better handling of argv
if (strcmp(argv[0], "exec") != 0 && int argc;
strcmp(argv[0], "exec_always") != 0 && char **argv = split_args(cmd, &argc);
strcmp(argv[0], "mode") != 0) { if (strcmp(argv[0], "exec") != 0 &&
int i; strcmp(argv[0], "exec_always") != 0 &&
for (i = 1; i < argc; ++i) { strcmp(argv[0], "mode") != 0) {
if (*argv[i] == '\"' || *argv[i] == '\'') { for (int i = 1; i < argc; ++i) {
strip_quotes(argv[i]); if (*argv[i] == '\"' || *argv[i] == '\'') {
} strip_quotes(argv[i]);
} }
} }
struct cmd_handler *handler = find_handler(argv[0], NULL, 0); }
if (!handler) { struct cmd_handler *handler = find_handler(argv[0], NULL, 0);
list_add(res_list, cmd_results_new(CMD_INVALID, if (!handler) {
"Unknown/invalid command '%s'", argv[0])); list_add(res_list, cmd_results_new(CMD_INVALID,
"Unknown/invalid command '%s'", argv[0]));
free_argv(argc, argv);
goto cleanup;
}
// Var replacement, for all but first argument of set
for (int i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) {
argv[i] = do_var_replacement(argv[i]);
}
if (!config->handler_context.using_criteria) {
// The container or workspace which this command will run on.
struct sway_node *node = con ? &con->node :
seat_get_focus_inactive(seat, &root->node);
set_config_node(node);
struct cmd_results *res = handler->handle(argc-1, argv+1);
list_add(res_list, res);
if (res->status == CMD_INVALID) {
free_argv(argc, argv); free_argv(argc, argv);
goto cleanup; goto cleanup;
} }
} else {
// Var replacement, for all but first argument of set for (int i = 0; i < views->length; ++i) {
for (int i = handler->handle == cmd_set ? 2 : 1; i < argc; ++i) { struct sway_view *view = views->items[i];
argv[i] = do_var_replacement(argv[i]); set_config_node(&view->container->node);
}
if (!config->handler_context.using_criteria) {
// The container or workspace which this command will run on.
struct sway_node *node = con ? &con->node :
seat_get_focus_inactive(seat, &root->node);
set_config_node(node);
struct cmd_results *res = handler->handle(argc-1, argv+1); struct cmd_results *res = handler->handle(argc-1, argv+1);
list_add(res_list, res); list_add(res_list, res);
if (res->status == CMD_INVALID) { if (res->status == CMD_INVALID) {
free_argv(argc, argv); free_argv(argc, argv);
goto cleanup; goto cleanup;
} }
} else {
for (int i = 0; i < views->length; ++i) {
struct sway_view *view = views->items[i];
set_config_node(&view->container->node);
struct cmd_results *res = handler->handle(argc-1, argv+1);
list_add(res_list, res);
if (res->status == CMD_INVALID) {
free_argv(argc, argv);
goto cleanup;
}
}
} }
free_argv(argc, argv); }
} while(cmdlist); free_argv(argc, argv);
} while(head); } while(head);
cleanup: cleanup:
free(exec); free(exec);

4
sway/tree/workspace.c
View file

@ -212,9 +212,9 @@ static void workspace_name_from_binding(const struct sway_binding * binding,
char *name = NULL; char *name = NULL;
// workspace n // workspace n
char *cmd = argsep(&cmdlist, " "); char *cmd = argsep(&cmdlist, " ", NULL);
if (cmdlist) { if (cmdlist) {
name = argsep(&cmdlist, ",;"); name = argsep(&cmdlist, ",;", NULL);
} }
// TODO: support "move container to workspace" bindings as well // TODO: support "move container to workspace" bindings as well