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

sway/ipc: ipc_user_sockaddr: Use sway_assert instead of assert.

Browse Source
This commit is contained in:
S. Christoffer Eliesen 2015-10-16 13:04:46 +02:00
parent 382b4e425a
commit 7cb0732030
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sway/ipc.c
View File

@ -82,14 +82,20 @@ 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));
assert(ipc_sockaddr != NULL); if (!sway_assert(ipc_sockaddr != NULL, "can't malloc ipc_sockaddr")) {
return NULL;
}
ipc_sockaddr->sun_family = AF_UNIX; ipc_sockaddr->sun_family = AF_UNIX;
int path_size = sizeof(ipc_sockaddr->sun_path); int path_size = sizeof(ipc_sockaddr->sun_path);
// Without logind: // 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; return ipc_sockaddr;
} }