TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 02:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix denylist add_list

Browse Source 
Signed-off-by: ACh Sulfate <xenonhydride@gmail.com>
Co-authored-by: John Wu <topjohnwu@gmail.com>
This commit is contained in:
Acetylcholine 2022-08-07 19:48:47 +08:00 committed by GitHub
parent 1b4a6850b8
commit aeb7fd7cb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
native/src/zygisk/deny/utils.cpp
View File

@ -179,20 +179,20 @@ static bool validate(const char *pkg, const char *proc) {
return pkg_valid && proc_valid; return pkg_valid && proc_valid;
} }
static auto add_hide_set(const char *pkg, const char *proc) { static bool add_hide_set(const char *pkg, const char *proc) {
auto p = pkg_to_procs[pkg].emplace(proc); auto p = pkg_to_procs[pkg].emplace(proc);
if (!p.second) if (!p.second)
return p; return false;
LOGI("denylist add: [%s/%s]\n", pkg, proc); LOGI("denylist add: [%s/%s]\n", pkg, proc);
if (!do_kill) if (!do_kill)
return p; return true;
if (str_eql(pkg, ISOLATED_MAGIC)) { if (str_eql(pkg, ISOLATED_MAGIC)) {
// Kill all matching isolated processes // Kill all matching isolated processes
kill_process<&proc_name_match<str_starts>>(proc, true); kill_process<&proc_name_match<str_starts>>(proc, true);
} else { } else {
kill_process(proc); kill_process(proc);
} }
return p; return true;
} }
static void clear_data() { static void clear_data() {
@ -234,10 +234,10 @@ static int add_list(const char *pkg, const char *proc) {
mutex_guard lock(data_lock); mutex_guard lock(data_lock);
if (!ensure_data()) if (!ensure_data())
return DenyResponse::ERROR; return DenyResponse::ERROR;
auto p = add_hide_set(pkg, proc); if (!add_hide_set(pkg, proc))
if (!p.second)
return DenyResponse::ITEM_EXIST; return DenyResponse::ITEM_EXIST;
update_pkg_uid(*p.first, false); auto it = pkg_to_procs.find(pkg);
update_pkg_uid(it->first, false);
} }
// Add to database // Add to database