TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-11 02:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always initialize module_list

Browse Source 
Close #5712
This commit is contained in:
topjohnwu 2022-05-06 01:40:19 -07:00
parent cffd024e9e
commit 90545057e9
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,6 +391,7 @@ static void daemon_entry() {
default_new(poll_map); default_new(poll_map);
default_new(poll_fds); default_new(poll_fds);
default_new(module_list);
// Register handler for main socket // Register handler for main socket
pollfd main_socket_pfd = { fd, POLLIN, 0 }; pollfd main_socket_pfd = { fd, POLLIN, 0 };

51
native/jni/core/module.cpp
View File

@ -583,34 +583,32 @@ void magic_mount() {
char buf[4096]; char buf[4096];
LOGI("* Loading modules\n"); LOGI("* Loading modules\n");
if (module_list) { for (const auto &m : *module_list) {
for (const auto &m : *module_list) { const char *module = m.name.data();
const char *module = m.name.data(); char *b = buf + sprintf(buf, "%s/" MODULEMNT "/%s/", MAGISKTMP.data(), module);
char *b = buf + sprintf(buf, "%s/" MODULEMNT "/%s/", MAGISKTMP.data(), module);
// Read props // Read props
strcpy(b, "system.prop"); strcpy(b, "system.prop");
if (access(buf, F_OK) == 0) { if (access(buf, F_OK) == 0) {
LOGI("%s: loading [system.prop]\n", module); LOGI("%s: loading [system.prop]\n", module);
load_prop_file(buf, false); load_prop_file(buf, false);
}
// Check whether skip mounting
strcpy(b, "skip_mount");
if (access(buf, F_OK) == 0)
continue;
// Double check whether the system folder exists
strcpy(b, "system");
if (access(buf, F_OK) != 0)
continue;
LOGI("%s: loading mount files\n", module);
b[-1] = '\0';
int fd = xopen(buf, O_RDONLY | O_CLOEXEC);
system->collect_files(module, fd);
close(fd);
} }
// Check whether skip mounting
strcpy(b, "skip_mount");
if (access(buf, F_OK) == 0)
continue;
// Double check whether the system folder exists
strcpy(b, "system");
if (access(buf, F_OK) != 0)
continue;
LOGI("%s: loading mount files\n", module);
b[-1] = '\0';
int fd = xopen(buf, O_RDONLY | O_CLOEXEC);
system->collect_files(module, fd);
close(fd);
} }
if (MAGISKTMP != "/sbin") { if (MAGISKTMP != "/sbin") {
// Need to inject our binaries into /system/bin // Need to inject our binaries into /system/bin
@ -768,7 +766,6 @@ static void collect_modules(bool open_zygisk) {
} }
void handle_modules() { void handle_modules() {
default_new(module_list);
prepare_modules(); prepare_modules();
collect_modules(false); collect_modules(false);
exec_module_scripts("post-fs-data"); exec_module_scripts("post-fs-data");