From 7cb073203038983ac641770ea8cc0db222ca0df7 Mon Sep 17 00:00:00 2001 From: "S. Christoffer Eliesen" Date: Fri, 16 Oct 2015 13:04:46 +0200 Subject: [PATCH] sway/ipc: ipc_user_sockaddr: Use sway_assert instead of assert. --- sway/ipc.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sway/ipc.c b/sway/ipc.c index 5599cdf0f..dba2acb3b 100644 --- a/sway/ipc.c +++ b/sway/ipc.c @@ -82,14 +82,20 @@ void ipc_terminate(void) { struct sockaddr_un *ipc_user_sockaddr(void) { struct sockaddr_un *ipc_sockaddr = malloc(sizeof(struct sockaddr_un)); - assert(ipc_sockaddr != NULL); + if (!sway_assert(ipc_sockaddr != NULL, "can't malloc ipc_sockaddr")) { + return NULL; + } ipc_sockaddr->sun_family = AF_UNIX; int path_size = sizeof(ipc_sockaddr->sun_path); // Without logind: - assert(snprintf(ipc_sockaddr->sun_path, path_size, "/tmp/sway-ipc.%i.sock", getuid()) < path_size); + int allocating_path_size = snprintf(ipc_sockaddr->sun_path, path_size, "/tmp/sway-ipc.%i.sock", getuid()); + + if (!sway_assert(allocating_path_size < path_size, "socket path won't fit into ipc_sockaddr->sun_path")) { + return NULL; + } return ipc_sockaddr; }