mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-10 20:44:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

sway/ipc: Use sway_abort instead of returning NULL.

Browse Source
This commit is contained in:
S. Christoffer Eliesen 2015-10-16 13:21:34 +02:00
parent 7cb0732030
commit 783290e81a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sway/ipc.c
View File

@ -82,8 +82,8 @@ void ipc_terminate(void) {
struct sockaddr_un *ipc_user_sockaddr(void) { struct sockaddr_un *ipc_user_sockaddr(void) {
struct sockaddr_un *ipc_sockaddr = malloc(sizeof(struct sockaddr_un)); struct sockaddr_un *ipc_sockaddr = malloc(sizeof(struct sockaddr_un));
if (!sway_assert(ipc_sockaddr != NULL, "can't malloc ipc_sockaddr")) { if (ipc_sockaddr == NULL) {
return NULL; sway_abort("can't malloc ipc_sockaddr");
} }
ipc_sockaddr->sun_family = AF_UNIX; ipc_sockaddr->sun_family = AF_UNIX;
@ -93,8 +93,8 @@ struct sockaddr_un *ipc_user_sockaddr(void) {
// Without logind: // Without logind:
int allocating_path_size = snprintf(ipc_sockaddr->sun_path, path_size, "/tmp/sway-ipc.%i.sock", getuid()); 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")) { if (allocating_path_size >= path_size) {
return NULL; sway_abort("socket path won't fit into ipc_sockaddr->sun_path");
} }
return ipc_sockaddr; return ipc_sockaddr;