mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-11 13:04:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

cmd_hide_edge_borders: add missing arg count check

Browse Source 
This adds the missing argument count check after the --i3 flag
processing in cmd_hide_edge_borders. Without the check,
`hide_edge_borders --i3` would result in a SIGSEGV instead of a syntax
error. There are some minor adjustments to make it so nothing gets
altered if this check fails
This commit is contained in:
Brian Ashworth 2019-06-03 22:29:36 -04:00 committed by Simon Ser
parent 6b6eb147ec
commit 799f5a2cd5
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sway/commands/hide_edge_borders.c
View File

@ -4,17 +4,23 @@
#include "sway/tree/view.h" #include "sway/tree/view.h"
struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) { struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
const char *expected_syntax = "Expected 'hide_edge_borders [--i3] "
"none|vertical|horizontal|both|smart|smart_no_gaps";
struct cmd_results *error = NULL; struct cmd_results *error = NULL;
if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_AT_LEAST, 1))) { if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_AT_LEAST, 1))) {
return error; return error;
} }
bool hide_lone_tab = false;
if (strcmp(*argv, "--i3") == 0) { if (strcmp(*argv, "--i3") == 0) {
config->hide_lone_tab = true; hide_lone_tab = true;
++argv; ++argv;
--argc; --argc;
} else { }
config->hide_lone_tab = false;
if (!argc) {
return cmd_results_new(CMD_INVALID, expected_syntax);
} }
if (strcmp(argv[0], "none") == 0) { if (strcmp(argv[0], "none") == 0) {
@ -30,9 +36,9 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) {
} else if (strcmp(argv[0], "smart_no_gaps") == 0) { } else if (strcmp(argv[0], "smart_no_gaps") == 0) {
config->hide_edge_borders = E_SMART_NO_GAPS; config->hide_edge_borders = E_SMART_NO_GAPS;
} else { } else {
return cmd_results_new(CMD_INVALID, "Expected 'hide_edge_borders " return cmd_results_new(CMD_INVALID, expected_syntax);
"[--i3] <none|vertical|horizontal|both|smart|smart_no_gaps>'");
} }
config->hide_lone_tab = hide_lone_tab;
config->saved_edge_borders = config->hide_edge_borders; config->saved_edge_borders = config->hide_edge_borders;
arrange_root(); arrange_root();