Merge pull request ganyao114#43 from MlgmXyysd/master

hooklib/src/main/java/com/swift/sandhook/SandHook.java

@@ -229,6 +229,9 @@ private static Object[] getFakeArgs(Method method) {
     }
 
     public static Object getObject(long address) {
+        if (address == 0) {
+            return null;
+        }
         long threadSelf = getThreadId();
         return getObjectNative(threadSelf, address);
     }

xposedcompat/src/main/java/com/swift/sandhook/xposedcompat/XposedCompat.java

@@ -3,7 +3,7 @@
 import android.app.Application;
 import android.content.Context;
 
-import com.swift.sandhook.xposedcompat.classloaders.ComposeClassLoader;
+import com.swift.sandhook.xposedcompat.classloaders.ProxyClassLoader;
 import com.swift.sandhook.xposedcompat.methodgen.DynamicBridge;
 import com.swift.sandhook.xposedcompat.utils.ApplicationUtils;
 import com.swift.sandhook.xposedcompat.utils.FileUtils;
@@ -76,7 +76,7 @@ public static ClassLoader getSandHookXposedClassLoader(ClassLoader appOriginClas
         if (sandHookXposedClassLoader != null) {
             return sandHookXposedClassLoader;
         } else {
-            sandHookXposedClassLoader = new ComposeClassLoader(sandBoxHostClassLoader, appOriginClassLoader);
+            sandHookXposedClassLoader = new ProxyClassLoader(sandBoxHostClassLoader, appOriginClassLoader);
             return sandHookXposedClassLoader;
         }
     }

xposedcompat/src/main/java/com/swift/sandhook/xposedcompat/classloaders/ProxyClassLoader.java

@@ -0,0 +1,30 @@
+package com.swift.sandhook.xposedcompat.classloaders;
+
+public class ProxyClassLoader extends ClassLoader {
+
+    private final ClassLoader mClassLoader;
+
+    public ProxyClassLoader(ClassLoader parentCL, ClassLoader appCL) {
+        super(parentCL);
+        mClassLoader = appCL;
+    }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        Class clazz = null;
+
+        try {
+            clazz = mClassLoader.loadClass(name);
+        } catch (ClassNotFoundException ignored) {
+        }
+
+        if (clazz == null) {
+            clazz = super.loadClass(name, resolve);
+            if (clazz == null) {
+                throw new ClassNotFoundException();
+            }
+        }
+
+        return clazz;
+    }
+}

xposedcompat/src/main/java/com/swift/sandhook/xposedcompat/methodgen/DynamicBridge.java

@@ -6,7 +6,7 @@
 import com.swift.sandhook.blacklist.HookBlackList;
 import com.swift.sandhook.wrapper.HookWrapper;
 import com.swift.sandhook.xposedcompat.XposedCompat;
-import com.swift.sandhook.xposedcompat.classloaders.ComposeClassLoader;
+import com.swift.sandhook.xposedcompat.classloaders.ProxyClassLoader;
 import com.swift.sandhook.xposedcompat.hookstub.HookMethodEntity;
 import com.swift.sandhook.xposedcompat.hookstub.HookStubManager;
 import com.swift.sandhook.xposedcompat.utils.DexLog;
@@ -73,7 +73,7 @@ public static synchronized void hookMethod(Member hookMethod, XposedBridge.Addit
                     hookMaker = defaultHookMaker;
                 }
                 hookMaker.start(hookMethod, additionalHookInfo,
-                        new ComposeClassLoader(DynamicBridge.class.getClassLoader(), hookMethod.getDeclaringClass().getClassLoader()), dexDir == null ? null : dexDir.getAbsolutePath());
+                        new ProxyClassLoader(DynamicBridge.class.getClassLoader(), hookMethod.getDeclaringClass().getClassLoader()), dexDir == null ? null : dexDir.getAbsolutePath());
                 hookedInfo.put(hookMethod, hookMaker.getCallBackupMethod());
             }
             DexLog.d("hook method <" + hookMethod.toString() + "> cost " + (System.currentTimeMillis() - timeStart) + " ms, by " + (stub != null ? "internal stub" : "dex maker"));

xposedcompat_new/src/main/java/com/swift/sandhook/xposedcompat/XposedCompat.java

@@ -11,7 +11,7 @@
 import com.swift.sandhook.wrapper.StubMethodsFactory;
 import com.swift.sandhook.xposedcompat.utils.ApplicationUtils;
 import com.swift.sandhook.xposedcompat.utils.ClassUtils;
-import com.swift.sandhook.xposedcompat.utils.ComposeClassLoader;
+import com.swift.sandhook.xposedcompat.utils.ProxyClassLoader;
 import com.swift.sandhook.xposedcompat.utils.ProcessUtils;
 
 import java.lang.reflect.Constructor;
@@ -227,7 +227,7 @@ public static ClassLoader getSandHookXposedClassLoader(ClassLoader appOriginClas
         if (sandHookXposedClassLoader != null) {
             return sandHookXposedClassLoader;
         } else {
-            sandHookXposedClassLoader = new ComposeClassLoader(sandBoxHostClassLoader, appOriginClassLoader);
+            sandHookXposedClassLoader = new ProxyClassLoader(sandBoxHostClassLoader, appOriginClassLoader);
             return sandHookXposedClassLoader;
         }
     }

xposedcompat_new/src/main/java/com/swift/sandhook/xposedcompat/utils/ProxyClassLoader.java

@@ -0,0 +1,30 @@
+package com.swift.sandhook.xposedcompat.utils;
+
+public class ProxyClassLoader extends ClassLoader {
+
+    private final ClassLoader mClassLoader;
+
+    public ProxyClassLoader(ClassLoader parentCL, ClassLoader appCL) {
+        super(parentCL);
+        mClassLoader = appCL;
+    }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        Class clazz = null;
+
+        try {
+            clazz = mClassLoader.loadClass(name);
+        } catch (ClassNotFoundException ignored) {
+        }
+
+        if (clazz == null) {
+            clazz = super.loadClass(name, resolve);
+            if (clazz == null) {
+                throw new ClassNotFoundException();
+            }
+        }
+
+        return clazz;
+    }
+}