gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-01-12 04:56:13 -08:00
Code Issues Packages Projects Releases Wiki Activity

Move find_apk_path to Rust

Browse Source
This commit is contained in:
topjohnwu
2023-06-10 01:40:45 -07:00
parent 40f25f4d56
commit f33f1d25d0
6 changed files with 44 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
native/src/core/package.cpp
View File

@@ -169,8 +169,9 @@ int get_manager(int user_id, string *pkg, bool install) {
if (stat(app_path, &st) == 0) {
int app_id = to_app_id(st.st_uid);
string apk = find_apk_path(str[SU_MANAGER].data());
int fd = xopen(apk.data(), O_RDONLY | O_CLOEXEC);
byte_array<PATH_MAX> apk;
find_apk_path(byte_view(str[SU_MANAGER]), apk);
int fd = xopen((const char *) apk.buf(), O_RDONLY | O_CLOEXEC);
string cert = read_certificate(fd);
close(fd);
@@ -178,7 +179,7 @@ int get_manager(int user_id, string *pkg, bool install) {
if (str[SU_MANAGER] == *mgr_pkg) {
if (app_id != mgr_app_id || cert != *mgr_cert) {
// app ID or cert should never change
LOGE("pkg: repackaged APK signature invalid: %s\n", apk.data());
LOGE("pkg: repackaged APK signature invalid: %s\n", apk.buf());
uninstall_pkg(mgr_pkg->data());
invalid = true;
install = true;