Skip to content

Commit f786e46

Browse files
author
Monkeylord
committed
修复一些bug
fix some bug
1 parent ce18da9 commit f786e46

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ android {
88
minSdkVersion 19
99
targetSdkVersion 26
1010
versionCode 2
11-
versionName "0.7.2"
11+
versionName "0.7.3"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
}
1414
buildTypes {

app/src/main/java/monkeylord/XServer/XServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public XServer(int port, Hashtable<String, Operation> route) {
115115
}
116116
ClassHandler.classLoaders.put("default-"+classLoader.hashCode(),classLoader);
117117
ClassHandler.monitorClassloaders(classLoader);
118-
ClassHandler.classLoaders.put("application-"+getCurrentApplication().getClassLoader().hashCode(),getCurrentApplication().getClassLoader());
118+
if(getCurrentApplication()!=null)ClassHandler.classLoaders.put("application-"+getCurrentApplication().getClassLoader().hashCode(),getCurrentApplication().getClassLoader());
119119
}
120120

121121
@Override

app/src/main/java/monkeylord/XServer/handler/ClassHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public class ClassHandler {
2121
public static HashMap<String, ClassLoader> classLoaders = new HashMap<>();
2222

23-
public static boolean monitorClassloaders(ClassLoader classLoader){
23+
public static boolean monitorClassloaders(final ClassLoader classLoader){
2424
try {
2525
Class classLoaderClz = ClassLoader.class;
2626
Member m = classLoaderClz.getDeclaredConstructor(ClassLoader.class);
@@ -29,7 +29,7 @@ public static boolean monitorClassloaders(ClassLoader classLoader){
2929
public void beforeHookedMethod(XServer_Param param) throws Throwable {
3030
super.beforeHookedMethod(param);
3131
classLoaders.put("classloader"+ param.thisObject.hashCode(), (ClassLoader) param.thisObject);
32-
classLoaders.put("classloader"+ ((ClassLoader) param.thisObject).getParent().hashCode(), (ClassLoader) ((ClassLoader) param.thisObject).getParent());
32+
if(((ClassLoader) param.thisObject).getParent()!=null)classLoaders.put("classloader"+ ((ClassLoader) param.thisObject).getParent().hashCode(), (ClassLoader) ((ClassLoader) param.thisObject).getParent());
3333
}
3434
});
3535
return true;

0 commit comments

Comments
 (0)