Check argc>0 before strcasecmp. Should shortcircuit

This commit is contained in:
Jason Nader 2020-01-18 18:33:43 +09:00
parent f59230e376
commit 7cf2231348
No known key found for this signature in database
GPG key ID: EC0F05857CEACA2F

View file

@ -916,19 +916,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) {