From 05656e09398f4125084632bd07ed507e5b123f81 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Sat, 27 Feb 2021 06:35:02 +0800
Subject: [PATCH] [core] Fix dexbuilder return type of constructor

---
 .../lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java
index bd2ef657..a5c49753 100644
--- a/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java
+++ b/core/src/main/java/io/github/lsposed/lspd/yahfa/dexmaker/HookerDexMaker.java
@@ -30,6 +30,7 @@ import io.github.lsposed.lspd.util.ProxyClassLoader;
 
 import java.io.File;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Executable;
 import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -99,7 +100,8 @@ public class HookerDexMaker {
         return parameterTypeIds;
     }
 
-    private static Class<?>[] getParameterTypes(Class<?>[] parameterTypes, boolean isStatic) {
+    private static Class<?>[] getParameterTypes(Executable method, boolean isStatic) {
+        Class<?>[] parameterTypes = method.getParameterTypes();
         if (isStatic) {
             return parameterTypes;
         }
@@ -107,7 +109,7 @@ public class HookerDexMaker {
         int targetParameterSize = parameterSize + 1;
         Class<?>[] newParameterTypes = new Class<?>[targetParameterSize];
         int offset = 1;
-        newParameterTypes[0] = Object.class;
+        newParameterTypes[0] = method.getDeclaringClass();
         System.arraycopy(parameterTypes, 0, newParameterTypes, offset, parameterTypes.length);
         return newParameterTypes;
     }
@@ -127,13 +129,14 @@ public class HookerDexMaker {
                 mReturnTypeId = TypeId.OBJECT;
             }
             mParameterTypeIds = getParameterTypeIds(method.getParameterTypes(), isStatic);
-            mActualParameterTypes = getParameterTypes(method.getParameterTypes(), isStatic);
+            mActualParameterTypes = getParameterTypes(method, isStatic);
         } else if (member instanceof Constructor) {
             Constructor constructor = (Constructor) member;
             isStatic = false;
             mReturnTypeId = TypeId.VOID;
+            mReturnType = void.class;
             mParameterTypeIds = getParameterTypeIds(constructor.getParameterTypes(), isStatic);
-            mActualParameterTypes = getParameterTypes(constructor.getParameterTypes(), isStatic);
+            mActualParameterTypes = getParameterTypes(constructor, isStatic);
         } else if (member.getDeclaringClass().isInterface()) {
             throw new IllegalArgumentException("Cannot hook interfaces: " + member.toString());
         } else if (Modifier.isAbstract(member.getModifiers())) {