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

Fix nullptr crash

This commit is contained in:
solohsu 2019-06-15 00:44:11 +08:00
parent ea57c60765
commit 11e25d9d84
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edxp-core/build.gradle
View File

@ -6,7 +6,7 @@ apply plugin: 'com.android.library'
version "v0.4.4.4_alpha" version "v0.4.4.4_alpha"
ext { ext {
versionCode = "4440" versionCode = "4441"
module_name = "EdXposed" module_name = "EdXposed"
jar_dest_dir = "${projectDir}/template_override/system/framework/" jar_dest_dir = "${projectDir}/template_override/system/framework/"
is_windows = OperatingSystem.current().isWindows() is_windows = OperatingSystem.current().isWindows()

10
edxp-core/src/main/cpp/main/include/art/runtime/mirror/class.h
View File

@ -19,14 +19,6 @@ namespace art {
return GetDescriptorSym(thiz, storage); return GetDescriptorSym(thiz, storage);
} }
CREATE_ORIGINAL_ENTRY(bool, IsInSamePackage, void *thiz, void *that) {
if (IsInSamePackageBackup) {
return IsInSamePackageBackup(thiz, that);
}
return false;
}
CREATE_HOOK_STUB_ENTRIES(bool, IsInSamePackage, void *thiz, void *that) { CREATE_HOOK_STUB_ENTRIES(bool, IsInSamePackage, void *thiz, void *that) {
std::string storage1, storage2; std::string storage1, storage2;
const char *thisDesc = GetDescriptor(thiz, &storage1); const char *thisDesc = GetDescriptor(thiz, &storage1);
@ -45,7 +37,7 @@ namespace art {
|| strstr(thatDesc, "android/content/res/XResources$XTypedArray") != nullptr) { || strstr(thatDesc, "android/content/res/XResources$XTypedArray") != nullptr) {
return true; return true;
} }
return IsInSamePackage(thiz, that); return IsInSamePackageBackup(thiz, that);
} }
public: public:

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

@ -32,7 +32,7 @@ namespace edxp {
CREATE_HOOK_STUB_ENTRIES(void *, mydlopen, const char *file_name, int flags, CREATE_HOOK_STUB_ENTRIES(void *, mydlopen, const char *file_name, int flags,
const void *caller) { const void *caller) {
void *handle = mydlopenBackup(file_name, flags, caller); void *handle = mydlopenBackup(file_name, flags, caller);
if (std::string(file_name).find(kLibArtName) != std::string::npos) { if (file_name != nullptr && std::string(file_name).find(kLibArtName) != std::string::npos) {
InstallArtHooks(handle); InstallArtHooks(handle);
} }
return handle; return handle;

2
edxp-core/template_override/common/util_functions.sh
View File

@ -1,6 +1,6 @@
#!/system/bin/sh #!/system/bin/sh
EDXP_VERSION="0.4.4.4_alpha (4440)" EDXP_VERSION="0.4.4.4_alpha (4441)"
ANDROID_SDK=`getprop ro.build.version.sdk` ANDROID_SDK=`getprop ro.build.version.sdk`
BUILD_DESC=`getprop ro.build.description` BUILD_DESC=`getprop ro.build.description`
PRODUCT=`getprop ro.build.product` PRODUCT=`getprop ro.build.product`