diff options
| author | Jason Nader <jason@kayoway.com> | 2020-01-18 18:33:43 +0900 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2020-01-22 13:30:53 -0500 |
| commit | 3644d6f4d3215cae7fb4cdda5d3a83bac66b071e (patch) | |
| tree | b280772bee32caf47177bcb6a863829dd1a6b205 | |
| parent | 3bc209fc9dde312f855b3f423a9cd984eb2dabf5 (diff) | |
Check argc>0 before strcasecmp. Should shortcircuit
| -rw-r--r-- | sway/commands/move.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index ceeab07c2..cdbad13e1 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -921,19 +921,13 @@ struct cmd_results *cmd_move(int argc, char **argv) { --argc; ++argv; } - if (strcasecmp(argv[0], "window") == 0 || - strcasecmp(argv[0], "container") == 0) { - --argc; - if (argc > 0) { - ++argv; - } + if (argc > 0 && (strcasecmp(argv[0], "window") == 0 || + strcasecmp(argv[0], "container") == 0)) { + --argc; ++argv; } - if (strcasecmp(argv[0], "to") == 0) { - --argc; - if (argc > 0) { - ++argv; - } + if (argc > 0 && strcasecmp(argv[0], "to") == 0) { + --argc; ++argv; } if (!argc) { |