sway

commit ab187405297b77f85e0d5ed9630ae43b2db61324
parent 557a14a6fe79002427008a0cf831808202609ae4
Author: Dominique Martinet <asmadeus@codewreck.org>
Date:   Sat, 30 Jun 2018 22:16:54 +0900

output commands: move !argc checks after argc gets decremented

Found through static analysis.

Diffstat:
M
sway/commands/output/mode.c
 | 
2
+-
M
sway/commands/output/position.c
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sway/commands/output/mode.c b/sway/commands/output/mode.c
@@ -36,11 +36,11 @@ struct cmd_results *output_cmd_mode(int argc, char **argv) {
 		}
 	} else {
 		// Format is 1234 4321
+		argc--; argv++;
 		if (!argc) {
 			return cmd_results_new(CMD_INVALID, "output",
 				"Missing mode argument (height).");
 		}
-		argc--; argv++;
 		output->height = strtol(*argv, &end, 10);
 		if (*end) {
 			return cmd_results_new(CMD_INVALID, "output",
diff --git a/sway/commands/output/position.c b/sway/commands/output/position.c
@@ -27,11 +27,11 @@ struct cmd_results *output_cmd_position(int argc, char **argv) {
 		}
 	} else {
 		// Format is 1234 4321 (legacy)
+		argc--; argv++;
 		if (!argc) {
 			return cmd_results_new(CMD_INVALID, "output",
 				"Missing position argument (y).");
 		}
-		argc--; argv++;
 		config->handler_context.output_config->y = strtol(*argv, &end, 10);
 		if (*end) {
 			return cmd_results_new(CMD_INVALID, "output",