ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Should be looking up all methods in invokevirtual, not just based off of the pool method and up. With test=true this fails on the constructor inlined constant value obfuscation.

Browse Source
This commit is contained in:
Adam
2016-01-29 21:52:39 -05:00
parent f50c6523c0
commit c8d29e3be4
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/net/runelite/deob/attributes/code/instructions/InvokeVirtual.java
View File

@@ -21,8 +21,9 @@ import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet;
import java.util.List; import java.util.List;
import net.runelite.deob.attributes.code.instruction.types.MappableInstruction; import java.util.Set;
import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil; import net.runelite.deob.deobfuscators.rename.MappingExecutorUtil;
import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping; import net.runelite.deob.deobfuscators.rename.ParallelExecutorMapping;
import net.runelite.deob.execution.Execution; import net.runelite.deob.execution.Execution;
@@ -113,14 +114,25 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
return myMethods != null ? myMethods : Arrays.asList(); return myMethods != null ? myMethods : Arrays.asList();
} }
private void findMethodFromClass(List<net.runelite.deob.Method> list, ClassFile clazz) private void findMethodFromClass(Set<ClassFile> visited, List<net.runelite.deob.Method> list, ClassFile clazz)
{ {
net.runelite.deob.Method m = clazz.findMethodDeep(method.getNameAndType()); if (visited.contains(clazz))
return;
visited.add(clazz);
ClassFile parent = clazz.getParent();
if (parent != null)
findMethodFromClass(visited, list, parent);
for (ClassFile cf : clazz.getInterfaces().getMyInterfaces())
findMethodFromClass(visited, list, cf);
net.runelite.deob.Method m = clazz.findMethod(method.getNameAndType());
if (m != null && !list.contains(m)) if (m != null && !list.contains(m))
list.add(m); list.add(m);
for (ClassFile cf : clazz.getChildren()) for (ClassFile cf : clazz.getChildren())
findMethodFromClass(list, cf); findMethodFromClass(visited, list, cf);
} }
@Override @Override
@@ -152,9 +164,10 @@ public class InvokeVirtual extends Instruction implements InvokeInstruction
if (otherClass == null) if (otherClass == null)
return; // not our class return; // not our class
// look up this method in this class and anything that inherits from it // when I recompile classes I can see the class of invokevirtuals methods change, get all methods
List<net.runelite.deob.Method> list = new ArrayList<>(); List<net.runelite.deob.Method> list = new ArrayList<>();
findMethodFromClass(list, otherClass); findMethodFromClass(new HashSet<>(), list, otherClass);
myMethods = list; myMethods = list;
} }

2
src/main/java/net/runelite/deob/deobfuscators/rename/MappingExecutorUtil.java
View File

@@ -120,7 +120,7 @@ public class MappingExecutorUtil
net.runelite.deob.pool.Method m = (net.runelite.deob.pool.Method) ii.getMethod(); net.runelite.deob.pool.Method m = (net.runelite.deob.pool.Method) ii.getMethod();
String className = m.getClassEntry().getName(); String className = m.getClassEntry().getName();
if (className.startsWith("java/")) if (className.startsWith("java/") || className.startsWith("netscape/"))
return false; return false;
return true; return true;