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

output_cmd_background: validate colors

Browse source 
This validates the color and fallback color in `output_cmd_background`
to ensure that only colors of the form `#RRGGBB` are accepted.
This commit is contained in:
Brian Ashworth 2019-03-15 03:00:40 -04:00 committed by emersion
parent d8f74e4706
commit e687e120e0
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sway/commands/output/background.c
View file

@ -20,6 +20,16 @@ static const char *bg_options[] = {
"tile", "tile",
}; };
static bool validate_color(const char *color) {
if (strlen(color) != 7 || color[0] != '#') {
return false;
}
char *ptr = NULL;
strtol(&color[1], &ptr, 16);
return *ptr == '\0';
}
struct cmd_results *output_cmd_background(int argc, char **argv) { struct cmd_results *output_cmd_background(int argc, char **argv) {
if (!config->handler_context.output_config) { if (!config->handler_context.output_config) {
return cmd_results_new(CMD_FAILURE, "Missing output config"); return cmd_results_new(CMD_FAILURE, "Missing output config");
@ -36,6 +46,10 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
struct output_config *output = config->handler_context.output_config; struct output_config *output = config->handler_context.output_config;
if (strcasecmp(argv[1], "solid_color") == 0) { if (strcasecmp(argv[1], "solid_color") == 0) {
if (!validate_color(argv[0])) {
return cmd_results_new(CMD_INVALID,
"Colors should be of the form #RRGGBB");
}
output->background = strdup(argv[0]); output->background = strdup(argv[0]);
output->background_option = strdup("solid_color"); output->background_option = strdup("solid_color");
output->background_fallback = NULL; output->background_fallback = NULL;
@ -130,6 +144,11 @@ struct cmd_results *output_cmd_background(int argc, char **argv) {
output->background_fallback = NULL; output->background_fallback = NULL;
if (argc && *argv[0] == '#') { if (argc && *argv[0] == '#') {
if (!validate_color(argv[0])) {
return cmd_results_new(CMD_INVALID,
"fallback color should be of the form #RRGGBB");
}
output->background_fallback = strdup(argv[0]); output->background_fallback = strdup(argv[0]);
argc--; argv++; argc--; argv++;