ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-04 08:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from izzytwosheds/bugfixes

Browse Source 
Interface methods in the vtable are called on current class, not interface
This commit is contained in:
Ben Gruver 2013-06-15 20:38:14 -07:00
commit a96cdbee3a
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassProto.java
View File

@ -45,6 +45,7 @@ import org.jf.dexlib2.iface.Field;
import org.jf.dexlib2.iface.Method; import org.jf.dexlib2.iface.Method;
import org.jf.dexlib2.iface.reference.FieldReference; import org.jf.dexlib2.iface.reference.FieldReference;
import org.jf.dexlib2.iface.reference.MethodReference; import org.jf.dexlib2.iface.reference.MethodReference;
import org.jf.dexlib2.immutable.ImmutableMethod;
import org.jf.util.ExceptionWithContext; import org.jf.util.ExceptionWithContext;
import org.jf.util.SparseArray; import org.jf.util.SparseArray;
@ -350,6 +351,7 @@ public class ClassProto implements TypeProto {
if (vtableIndex < 0 || vtableIndex >= vtable.size()) { if (vtableIndex < 0 || vtableIndex >= vtable.size()) {
return null; return null;
} }
return vtable.get(vtableIndex); return vtable.get(vtableIndex);
} }
@ -596,8 +598,22 @@ public class ClassProto implements TypeProto {
if (!isInterface()) { if (!isInterface()) {
addToVtable(getClassDef().getVirtualMethods(), vtable, true); addToVtable(getClassDef().getVirtualMethods(), vtable, true);
// assume that interface method is implemented in the current class, when adding it to vtable
// otherwise it looks like that method is invoked on an interface, which fails Dalvik's optimization checks
for (ClassDef interfaceDef: getDirectInterfaces()) { for (ClassDef interfaceDef: getDirectInterfaces()) {
addToVtable(interfaceDef.getVirtualMethods(), vtable, false); List<Method> interfaceMethods = Lists.newArrayList();
for (Method interfaceMethod: interfaceDef.getVirtualMethods()) {
ImmutableMethod method = new ImmutableMethod(
type,
interfaceMethod.getName(),
interfaceMethod.getParameters(),
interfaceMethod.getReturnType(),
interfaceMethod.getAccessFlags(),
interfaceMethod.getAnnotations(),
interfaceMethod.getImplementation());
interfaceMethods.add(method);
}
addToVtable(interfaceMethods, vtable, false);
} }
} }
return vtable; return vtable;