TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-04-20 20:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't let remote errors crash Zygisk

Browse Source 
Fix #6095
This commit is contained in:
残页 2022-08-07 20:09:46 +08:00 committed by GitHub
parent 7357a35f8d
commit 52ba6d11bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
native/src/core/daemon.cpp
View File

@ -447,13 +447,13 @@ int connect_daemon(int req, bool create) {
break; break;
case MainResponse::ERROR: case MainResponse::ERROR:
LOGE("Daemon error\n"); LOGE("Daemon error\n");
exit(-1); return -1;
case MainResponse::ROOT_REQUIRED: case MainResponse::ROOT_REQUIRED:
LOGE("Root is required for this operation\n"); LOGE("Root is required for this operation\n");
exit(-1); return -1;
case MainResponse::ACCESS_DENIED: case MainResponse::ACCESS_DENIED:
LOGE("Access denied\n"); LOGE("Access denied\n");
exit(-1); return -1;
default: default:
__builtin_unreachable(); __builtin_unreachable();
} }

1
native/src/zygisk/zygisk.hpp
View File

@ -59,6 +59,7 @@ int remote_request_unmount();
inline int zygisk_request(int req) { inline int zygisk_request(int req) {
int fd = connect_daemon(MainRequest::ZYGISK); int fd = connect_daemon(MainRequest::ZYGISK);
if (fd < 0) return fd;
write_int(fd, req); write_int(fd, req);
return fd; return fd;
} }