From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Fri, 3 Jun 2022 00:19:31 +0000 (+0200)
Subject: Prevent missing direction arguments to segfault labwc
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=986ab70780efd3e4f16f139e4a11d50d75e8ca5a;p=proto%2Flabwc.git

Prevent missing direction arguments to segfault labwc

Reported-by: @Flrian
---

diff --git a/src/action.c b/src/action.c
index 646ca4d8..07539ecb 100644
--- a/src/action.c
+++ b/src/action.c
@@ -174,10 +174,18 @@ actions_run(struct view *activator, struct server *server,
 			wl_display_terminate(server->wl_display);
 			break;
 		case ACTION_TYPE_MOVE_TO_EDGE:
-			view_move_to_edge(view, action->arg);
+			if (action->arg) {
+				view_move_to_edge(view, action->arg);
+			} else {
+				wlr_log(WLR_ERROR, "Missing argument for MoveToEdge");
+			}
 			break;
 		case ACTION_TYPE_SNAP_TO_EDGE:
-			view_snap_to_edge(view, action->arg);
+			if (action->arg) {
+				view_snap_to_edge(view, action->arg);
+			} else {
+				wlr_log(WLR_ERROR, "Missing argument for SnapToEdge");
+			}
 			break;
 		case ACTION_TYPE_NEXT_WINDOW:
 			server->cycle_view = desktop_cycle_view(server,
diff --git a/src/view.c b/src/view.c
index 443b6e64..b8524253 100644
--- a/src/view.c
+++ b/src/view.c
@@ -460,6 +460,10 @@ view_move_to_edge(struct view *view, const char *direction)
 		wlr_log(WLR_ERROR, "no output");
 		return;
 	}
+	if (!direction) {
+		wlr_log(WLR_ERROR, "invalid edge");
+		return;
+	}
 	struct wlr_box usable = output_usable_area_in_layout_coords(output);
 	if (usable.height == output->wlr_output->height
 			&& output->wlr_output->scale != 1) {
@@ -485,6 +489,9 @@ view_move_to_edge(struct view *view, const char *direction)
 		x = view->x;
 		y = usable.y + usable.height - view->h - view->margin.bottom
 			- rc.gap;
+	} else {
+		wlr_log(WLR_ERROR, "invalid edge");
+		return;
 	}
 	view_move(view, x, y);
 }
@@ -521,6 +528,9 @@ view_edge_invert(enum view_edge edge)
 static enum view_edge
 view_edge_parse(const char *direction)
 {
+	if (!direction) {
+		return VIEW_EDGE_INVALID;
+	}
 	if (!strcasecmp(direction, "left")) {
 		return VIEW_EDGE_LEFT;
 	} else if (!strcasecmp(direction, "up")) {