Check argc>0 before strcasecmp. Should shortcircuit

This commit is contained in:
Jason Nader 2020-01-18 18:33:43 +09:00 committed by Drew DeVault
parent 3bc209fc9d
commit 3644d6f4d3
1 changed files with 5 additions and 11 deletions

View File

@ -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) {