diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-04-29 14:16:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-29 14:16:20 -0400 |
commit | 5e845a38f56a1bea2a11af904665d9312f5b7f89 (patch) | |
tree | 1b50378068c90543520a8833c0e493b5d0ff2b31 | |
parent | Add HACKING.md (diff) | |
parent | prevent crash when `layout auto` is missing args (diff) | |
download | sway-5e845a38f56a1bea2a11af904665d9312f5b7f89.tar.gz sway-5e845a38f56a1bea2a11af904665d9312f5b7f89.tar.zst sway-5e845a38f56a1bea2a11af904665d9312f5b7f89.zip |
Merge pull request #1204 from zandrmartin/prevent-layout-auto-crash
prevent crash when `layout auto` is missing args
-rw-r--r-- | sway/commands/layout.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/commands/layout.c b/sway/commands/layout.c index 40ebd590..57a86565 100644 --- a/sway/commands/layout.c +++ b/sway/commands/layout.c | |||
@@ -85,6 +85,10 @@ static struct cmd_results *cmd_layout_auto(swayc_t *container, int argc, char ** | |||
85 | enum swayc_layouts old_layout = container->layout; | 85 | enum swayc_layouts old_layout = container->layout; |
86 | enum swayc_layouts layout = old_layout; | 86 | enum swayc_layouts layout = old_layout; |
87 | 87 | ||
88 | if ((error = checkarg(argc, "layout auto", EXPECTED_MORE_THAN, 1))) { | ||
89 | return error; | ||
90 | } | ||
91 | |||
88 | if (strcasecmp(argv[1], "left") == 0) { | 92 | if (strcasecmp(argv[1], "left") == 0) { |
89 | layout = L_AUTO_LEFT; | 93 | layout = L_AUTO_LEFT; |
90 | } else if (strcasecmp(argv[1], "right") == 0) { | 94 | } else if (strcasecmp(argv[1], "right") == 0) { |