diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2019-06-03 22:29:36 -0400 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2019-06-04 08:47:36 +0300 |
commit | 799f5a2cd5ffa83d73816489aa8683564bc226f7 (patch) | |
tree | 2f9bc4f5d5c544a3539259a3a44b70c1e4fc956d | |
parent | Bump meson version to 1.1 (diff) | |
download | sway-799f5a2cd5ffa83d73816489aa8683564bc226f7.tar.gz sway-799f5a2cd5ffa83d73816489aa8683564bc226f7.tar.zst sway-799f5a2cd5ffa83d73816489aa8683564bc226f7.zip |
cmd_hide_edge_borders: add missing arg count check
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
-rw-r--r-- | sway/commands/hide_edge_borders.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sway/commands/hide_edge_borders.c b/sway/commands/hide_edge_borders.c index ac439cc0..f69bece1 100644 --- a/sway/commands/hide_edge_borders.c +++ b/sway/commands/hide_edge_borders.c | |||
@@ -4,17 +4,23 @@ | |||
4 | #include "sway/tree/view.h" | 4 | #include "sway/tree/view.h" |
5 | 5 | ||
6 | struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) { | 6 | struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) { |
7 | const char *expected_syntax = "Expected 'hide_edge_borders [--i3] " | ||
8 | "none|vertical|horizontal|both|smart|smart_no_gaps"; | ||
9 | |||
7 | struct cmd_results *error = NULL; | 10 | struct cmd_results *error = NULL; |
8 | if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_AT_LEAST, 1))) { | 11 | if ((error = checkarg(argc, "hide_edge_borders", EXPECTED_AT_LEAST, 1))) { |
9 | return error; | 12 | return error; |
10 | } | 13 | } |
11 | 14 | ||
15 | bool hide_lone_tab = false; | ||
12 | if (strcmp(*argv, "--i3") == 0) { | 16 | if (strcmp(*argv, "--i3") == 0) { |
13 | config->hide_lone_tab = true; | 17 | hide_lone_tab = true; |
14 | ++argv; | 18 | ++argv; |
15 | --argc; | 19 | --argc; |
16 | } else { | 20 | } |
17 | config->hide_lone_tab = false; | 21 | |
22 | if (!argc) { | ||
23 | return cmd_results_new(CMD_INVALID, expected_syntax); | ||
18 | } | 24 | } |
19 | 25 | ||
20 | if (strcmp(argv[0], "none") == 0) { | 26 | if (strcmp(argv[0], "none") == 0) { |
@@ -30,9 +36,9 @@ struct cmd_results *cmd_hide_edge_borders(int argc, char **argv) { | |||
30 | } else if (strcmp(argv[0], "smart_no_gaps") == 0) { | 36 | } else if (strcmp(argv[0], "smart_no_gaps") == 0) { |
31 | config->hide_edge_borders = E_SMART_NO_GAPS; | 37 | config->hide_edge_borders = E_SMART_NO_GAPS; |
32 | } else { | 38 | } else { |
33 | return cmd_results_new(CMD_INVALID, "Expected 'hide_edge_borders " | 39 | return cmd_results_new(CMD_INVALID, expected_syntax); |
34 | "[--i3] <none|vertical|horizontal|both|smart|smart_no_gaps>'"); | ||
35 | } | 40 | } |
41 | config->hide_lone_tab = hide_lone_tab; | ||
36 | config->saved_edge_borders = config->hide_edge_borders; | 42 | config->saved_edge_borders = config->hide_edge_borders; |
37 | 43 | ||
38 | arrange_root(); | 44 | arrange_root(); |