From 9ad1e6b40f9589a5ab8242dd3b2e514b70d97799 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Thu, 15 Dec 2016 17:05:12 -0500
Subject: [PATCH] Handle malloc failure in ipc_recv_response

---
 common/ipc-client.c | 13 +++++++++++++
 common/log.c        | 11 ++++++++---
 swaybar/ipc.c       |  3 +++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/common/ipc-client.c b/common/ipc-client.c
index 106f9d86a..d011bd26d 100644
--- a/common/ipc-client.c
+++ b/common/ipc-client.c
@@ -52,10 +52,18 @@ struct ipc_response *ipc_recv_response(int socketfd) {
 	}
 
 	struct ipc_response *response = malloc(sizeof(struct ipc_response));
+	if (!response) {
+		goto error_1;
+	}
+
 	total = 0;
 	response->size = data32[0];
 	response->type = data32[1];
 	char *payload = malloc(response->size + 1);
+	if (!payload) {
+		goto error_2;
+	}
+
 	while (total < response->size) {
 		ssize_t received = recv(socketfd, payload + total, response->size - total, 0);
 		if (received < 0) {
@@ -67,6 +75,11 @@ struct ipc_response *ipc_recv_response(int socketfd) {
 	response->payload = payload;
 
 	return response;
+error_2:
+	free(response);
+error_1:
+	sway_log(L_ERROR, "Unable to allocate memory for IPC response");
+	return NULL;
 }
 
 void free_ipc_response(struct ipc_response *response) {
diff --git a/common/log.c b/common/log.c
index 4f0baa3f7..825b176b0 100644
--- a/common/log.c
+++ b/common/log.c
@@ -88,9 +88,14 @@ void _sway_log(const char *filename, int line, log_importance_t verbosity, const
 		}
 
 		if (filename && line) {
-			char *file = strdup(filename);
-			fprintf(stderr, "[%s:%d] ", basename(file), line);
-			free(file);
+			const char *file = filename + strlen(filename);
+			while (file != filename && *file != '/') {
+				--file;
+			}
+			if (*file == '/') {
+				++file;
+			}
+			fprintf(stderr, "[%s:%d] ", file, line);
 		}
 
 		va_list args;
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index 8d2f4e9a0..f2da7392b 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -331,6 +331,9 @@ void ipc_bar_init(struct bar *bar, const char *bar_id) {
 
 bool handle_ipc_event(struct bar *bar) {
 	struct ipc_response *resp = ipc_recv_response(bar->ipc_event_socketfd);
+	if (!resp) {
+		return false;
+	}
 	switch (resp->type) {
 	case IPC_EVENT_WORKSPACE:
 		ipc_update_workspaces(bar);