TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-03-28 19:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close fd

Browse Source
This commit is contained in:
vvb2060 2021-09-23 15:18:34 +08:00 committed by John Wu
parent a0fe78a728
commit ecd332c573
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
native/jni/core/daemon.cpp
View File

@ -361,7 +361,7 @@ static void daemon_entry() {
} }
} }
sockaddr_un sun; sockaddr_un sun{};
socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET); socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET);
fd = xsocket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0); fd = xsocket(AF_LOCAL, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (xbind(fd, (sockaddr*) &sun, len)) if (xbind(fd, (sockaddr*) &sun, len))
@ -380,12 +380,13 @@ static void daemon_entry() {
} }
int connect_daemon(bool create) { int connect_daemon(bool create) {
sockaddr_un sun; sockaddr_un sun{};
socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET); socklen_t len = setup_sockaddr(&sun, MAIN_SOCKET);
int fd = xsocket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); int fd = xsocket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (connect(fd, (sockaddr*) &sun, len)) { if (connect(fd, (sockaddr*) &sun, len)) {
if (!create || getuid() != UID_ROOT) { if (!create || getuid() != UID_ROOT) {
LOGE("No daemon is currently running!\n"); LOGE("No daemon is currently running!\n");
close(fd);
return -1; return -1;
} }