Merge pull request #2861 from RyanDwyer/fix-empty-workspace-crashes

Fix crashes when running certain commands on an empty workspace

4 files changed, 4 insertions, 4 deletions

diff --git a/sway/commands/border.c b/sway/commands/border.c
index cc0d635a..2eed27bd 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -59,7 +59,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
         }
 
         struct sway_container *container = config->handler_context.container;
-        if (!container->view) {
+        if (!container || !container->view) {
                 return cmd_results_new(CMD_INVALID, "border",
                                 "Only views can have borders");
         }
diff --git a/sway/commands/mark.c b/sway/commands/mark.c
index fb95a7d0..b1f47be1 100644
--- a/sway/commands/mark.c
+++ b/sway/commands/mark.c
@@ -19,7 +19,7 @@ struct cmd_results *cmd_mark(int argc, char **argv) {
                 return error;
         }
         struct sway_container *container = config->handler_context.container;
-        if (!container->view) {
+        if (!container || !container->view) {
                 return cmd_results_new(CMD_INVALID, "mark",
                                 "Only views can have marks");
         }
diff --git a/sway/commands/title_format.c b/sway/commands/title_format.c
index c9ffe8fa..ef1c8935 100644
--- a/sway/commands/title_format.c
+++ b/sway/commands/title_format.c
@@ -12,7 +12,7 @@ struct cmd_results *cmd_title_format(int argc, char **argv) {
                 return error;
         }
         struct sway_container *container = config->handler_context.container;
-        if (!container->view) {
+        if (!container || !container->view) {
                 return cmd_results_new(CMD_INVALID, "title_format",
                                 "Only views can have a title_format");
         }
diff --git a/sway/commands/unmark.c b/sway/commands/unmark.c
index c6251dc8..c671ed4e 100644
--- a/sway/commands/unmark.c
+++ b/sway/commands/unmark.c
@@ -25,7 +25,7 @@ struct cmd_results *cmd_unmark(int argc, char **argv) {
         struct sway_view *view = NULL;
         if (config->handler_context.using_criteria) {
                 struct sway_container *container = config->handler_context.container;
-                if (!container->view) {
+                if (!container || !container->view) {
                         return cmd_results_new(CMD_INVALID, "unmark",
                                         "Only views can have marks");
                 }