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

Install native hook iff needed (#496) 

* iff: https://en.wikipedia.org/wiki/If_and_only_if
This commit is contained in:
LoveSy 2021-04-20 00:44:10 +08:00 committed by GitHub
parent 2eae90dfe7
commit 362ab24859
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/cpp/main/src/context.cpp
View File

@ -68,7 +68,7 @@ namespace lspd {
fseek(f, 0, SEEK_END);
dex.resize(ftell(f));
rewind(f);
if (dex.size() != fread(dex.data(), 1, dex.size(), f)) {
if (dex.size() != fread(dex.data(), sizeof(decltype(dex)::value_type), dex.size(), f)) {
LOGE("Read dex failed");
dex.resize(0);
}
@ -90,8 +90,7 @@ namespace lspd {
auto initMid = JNI_GetMethodID(env, in_memory_classloader, "<init>",
"(Ljava/nio/ByteBuffer;Ljava/lang/ClassLoader;)V");
auto byte_buffer_class = JNI_FindClass(env, "java/nio/ByteBuffer");
auto dex_buffer = env->NewDirectByteBuffer(reinterpret_cast<void *>(dex.data()),
dex.size());
auto dex_buffer = env->NewDirectByteBuffer(dex.data(), dex.size());
if (auto my_cl = JNI_NewObject(env, in_memory_classloader, initMid,
dex_buffer, sys_classloader)) {
inject_class_loader_ = JNI_NewGlobalRef(env, my_cl);

2
core/src/main/cpp/main/src/context.h
View File

@ -69,7 +69,7 @@ namespace lspd {
jclass class_linker_class_ = nullptr;
jmethodID post_fixup_static_mid_ = nullptr;
bool skip_ = false;
std::vector<char> dex{};
std::vector<std::byte> dex{};
Context() {}

2
core/src/main/cpp/main/src/jni/native_api.h
View File

@ -28,7 +28,7 @@
#include <jni.h>
namespace lspd {
void RegisterNativeAPI(JNIEnv*);
void RegisterNativeAPI(JNIEnv *);
}

5
core/src/main/cpp/main/src/native_api.cpp
View File

@ -58,6 +58,11 @@ namespace lspd {
}
void RegisterNativeLib(const std::string &library_name) {
static bool initialized = []() {
InstallNativeAPI();
return true;
}();
if (UNLIKELY(!initialized)) return;
LOGD("native_api: Registered %s", library_name.c_str());
moduleNativeLibs.push_back(library_name);
}

2
core/src/main/cpp/main/src/native_hook.cpp
View File

@ -64,7 +64,7 @@ namespace lspd {
InstallRiruHooks();
// install ART hooks
InstallArtHooks(handle_libart);
InstallNativeAPI();
// InstallNativeAPI();
}
void InstallArtHooks(void *art_handle) {