sway

commit 437ae2856649514273824cdaa608ff8272173589
parent 4fd3996d7761c8ff4716463ffe18399a8894577e
Author: Drew DeVault <sir@cmpwn.com>
Date:   Thu,  3 May 2018 09:17:35 -0400

Merge pull request #1906 from emersion/fix-resize-no-arg-segfault

Fix segfault when running the resize command without arguments
Diffstat:
M
sway/commands/resize.c
 | 
10
++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/sway/commands/resize.c b/sway/commands/resize.c
@@ -219,15 +219,17 @@ struct cmd_results *cmd_resize(int argc, char **argv) {
 		return cmd_results_new(CMD_INVALID, "resize",
 				"Can only resize views/containers");
 	}
+
+	struct cmd_results *error;
+	if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
+		return error;
+	}
+
 	if (strcasecmp(argv[0], "set") == 0) {
 		// TODO
 		//return cmd_resize_set(argc - 1, &argv[1]);
 		return cmd_results_new(CMD_INVALID, "resize", "resize set unimplemented");
 	}
-	struct cmd_results *error;
-	if ((error = checkarg(argc, "resize", EXPECTED_AT_LEAST, 2))) {
-		return error;
-	}
 
 	// TODO: resize grow|shrink left|right|up|down