WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Workaround for multiple calls to the same unhook (#1760)

This commit is contained in:
LoveSy 2022-03-15 20:28:54 +08:00 committed by GitHub
parent 1790cbb608
commit 4f7e8970ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/jni/src/jni/hook_bridge.cpp
View File

@ -32,7 +32,7 @@ namespace {
struct HookItem { struct HookItem {
jobject backup {nullptr}; jobject backup {nullptr};
jobjectArray callbacks {nullptr}; jobjectArray callbacks {nullptr};
std::multiset<jint> priorities {}; std::multiset<jint, std::greater<>> priorities {};
}; };
std::shared_mutex hooked_lock; std::shared_mutex hooked_lock;
@ -119,8 +119,9 @@ LSP_DEF_NATIVE_METHOD(jboolean, HookBridge, unhookMethod, jobject hookMethod, jo
} }
} }
if (!hook_item) return JNI_FALSE; if (!hook_item) return JNI_FALSE;
env->MonitorEnter(hook_item->callbacks); JNIMonitor monitor(env, hook_item->callbacks);
auto old_array = (jobjectArray) env->GetObjectArrayElement(hook_item->callbacks, 0); auto old_array = (jobjectArray) env->GetObjectArrayElement(hook_item->callbacks, 0);
if (hook_item->priorities.empty()) return JNI_FALSE;
auto new_array = env->NewObjectArray(static_cast<jint>(hook_item->priorities.size() - 1), env->FindClass("java/lang/Object"), nullptr); auto new_array = env->NewObjectArray(static_cast<jint>(hook_item->priorities.size() - 1), env->FindClass("java/lang/Object"), nullptr);
auto to_remove = hook_item->priorities.end(); auto to_remove = hook_item->priorities.end();
for (auto [i, current, passed] = std::make_tuple(0, hook_item->priorities.begin(), false); current != hook_item->priorities.end(); ++current, ++i) { for (auto [i, current, passed] = std::make_tuple(0, hook_item->priorities.begin(), false); current != hook_item->priorities.end(); ++current, ++i) {
@ -144,7 +145,6 @@ LSP_DEF_NATIVE_METHOD(jboolean, HookBridge, unhookMethod, jobject hookMethod, jo
} }
env->DeleteLocalRef(old_array); env->DeleteLocalRef(old_array);
env->DeleteLocalRef(new_array); env->DeleteLocalRef(new_array);
env->MonitorExit(hook_item->callbacks);
return removed ? JNI_TRUE : JNI_FALSE; return removed ? JNI_TRUE : JNI_FALSE;
} }

2
external/lsplant vendored

@ -1 +1 @@
Subproject commit b0c3e27061dcc2f3f7e03211fc75acece6c37bce Subproject commit 2bd70518410ccd6a25adc876a3619d0b23f92e5a