From 248df18c24d2a849de984b477ca3913ce7c72441 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 15 Dec 2016 17:39:09 -0500
Subject: Handle allocation failure in commands

---
 sway/commands.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'sway/commands.c')

diff --git a/sway/commands.c b/sway/commands.c
index d87d0084..dee03d71 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -386,7 +386,11 @@ struct cmd_results *handle_command(char *_exec, enum command_context context) {
 			if (!results) {
 				int len = strlen(criteria) + strlen(head) + 4;
 				char *tmp = malloc(len);
-				snprintf(tmp, len, "[%s] %s", criteria, head);
+				if (tmp) {
+					snprintf(tmp, len, "[%s] %s", criteria, head);
+				} else {
+					sway_log(L_DEBUG, "Unable to allocate criteria string for cmd result");
+				}
 				results = cmd_results_new(CMD_INVALID, tmp,
 					"Can't handle criteria string: Refusing to execute command");
 				free(tmp);
@@ -584,6 +588,10 @@ cleanup:
 
 struct cmd_results *cmd_results_new(enum cmd_status status, const char* input, const char *format, ...) {
 	struct cmd_results *results = malloc(sizeof(struct cmd_results));
+	if (!results) {
+		sway_log(L_ERROR, "Unable to allocate command results");
+		return NULL;
+	}
 	results->status = status;
 	if (input) {
 		results->input = strdup(input); // input is the command name
@@ -594,7 +602,9 @@ struct cmd_results *cmd_results_new(enum cmd_status status, const char* input, c
 		char *error = malloc(256);
 		va_list args;
 		va_start(args, format);
-		vsnprintf(error, 256, format, args);
+		if (error) {
+			vsnprintf(error, 256, format, args);
+		}
 		va_end(args);
 		results->error = error;
 	} else {
-- 
cgit v1.2.3


From 8cef81d6f23adb66873ee5fd84aa7180b22624f2 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 15 Dec 2016 18:03:59 -0500
Subject: Handle some more memory allocation failures

---
 sway/commands.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sway/commands.c')

diff --git a/sway/commands.c b/sway/commands.c
index dee03d71..8d199467 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -121,6 +121,9 @@ void input_cmd_apply(struct input_config *input) {
 		for (int i = 0; i < input_devices->length; ++i) {
 			device = input_devices->items[i];
 			char* dev_identifier = libinput_dev_unique_id(device);
+			if (!dev_identifier) {
+				break;
+			}
 			int match = dev_identifier && strcmp(dev_identifier, input->identifier) == 0;
 			free(dev_identifier);
 			if (match) {
-- 
cgit v1.2.3


From 7784f1a905cad5ad805195dcc3cba23ff206501c Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 15 Dec 2016 18:10:29 -0500
Subject: Handle allocation failures in security code

Note that such errors are generally going to be fatal
---
 sway/commands.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sway/commands.c')

diff --git a/sway/commands.c b/sway/commands.c
index 8d199467..c15cb00a 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -575,6 +575,9 @@ struct cmd_results *config_commands_command(char *exec) {
 	}
 	if (!policy) {
 		policy = alloc_command_policy(cmd);
+		if (!policy) {
+			sway_abort("Unable to allocate security policy");
+		}
 		list_add(config->command_policies, policy);
 	}
 	policy->context = context;
-- 
cgit v1.2.3