Check argc>0 before strcasecmp. Should shortcircuit

xdavidwu · Jan 18, 2020 · a576bc2 · a576bc2
1 parent 450b40c
commit a576bc2
Showing 1 changed file with 5 additions and 11 deletions.
diff --git 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) {