LegacyConsole/jpexs-decompiler
4
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-06-16 12:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

ABCPanel exec in event dispatch fix

Browse Source 
Issue #1083 Fixed offsets of try after AS3 deobfuscation
This commit is contained in:
Jindra Petřík
2015-11-23 05:54:10 +01:00
parent 22aadefd59
commit b2136f8f17
4 changed files with 29 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java
View File

@@ -2088,9 +2088,9 @@ public class AVM2Code implements Cloneable {
@Override
public int updateOperandOffset(long insAddr, long targetAddress, int offset) {
if (insAddr == -1) { //do not check exceptions
return offset;
}
/*if (insAddr == -1) {
return offset;
}*/
adr2pos(targetAddress);
return offset;
}

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegisters.java
View File

@@ -148,9 +148,9 @@ public class AVM2DeobfuscatorRegisters extends AVM2DeobfuscatorSimple {
listedLastBodies.add(bodybefore);
}
body.getCode().removeDeadCode(body);
originalBody.exceptions = body.exceptions;
originalBody.setCode(body.getCode());
body.getCode().removeDeadCode(body);
//System.err.println("/deo");
}

30
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AVM2DeobfuscatorRegistersOld.java
View File

@@ -146,37 +146,11 @@ public class AVM2DeobfuscatorRegistersOld extends AVM2DeobfuscatorSimpleOld {
listedLastBodies.add(bodybefore);
}
body.getCode().removeDeadCode(body);
originalBody.exceptions = body.exceptions;
originalBody.setCode(body.getCode());
body.getCode().removeDeadCode(body);
//System.err.println("/deo");
}
private void replaceSingleUseRegisters(Map<Integer, GraphTargetItem> singleRegisters, List<AVM2Instruction> setInss, int classIndex, boolean isStatic, int scriptIndex, ABC abc, AVM2ConstantPool cpool, Trait trait, MethodInfo minfo, MethodBody body) throws InterruptedException {
AVM2Code code = body.getCode();
for (int i = 0; i < code.code.size(); i++) {
if (Thread.currentThread().isInterrupted()) {
throw new InterruptedException();
}
AVM2Instruction ins = code.code.get(i);
if (((setInss == null) || setInss.contains(ins)) && (ins.definition instanceof SetLocalTypeIns)) {
SetLocalTypeIns slt = (SetLocalTypeIns) ins.definition;
int regId = slt.getRegisterId(ins);
if (singleRegisters.containsKey(regId)) {
code.replaceInstruction(i, new AVM2Instruction(ins.offset, DeobfuscatePopIns.getInstance(), null), body);
}
}
if (ins.definition instanceof GetLocalTypeIns) {
GetLocalTypeIns glt = (GetLocalTypeIns) ins.definition;
int regId = glt.getRegisterId(ins);
if (singleRegisters.containsKey(regId)) {
code.replaceInstruction(i, cpool.makePush(singleRegisters.get(regId).getResult()), body);
}
}
}
}
private int getFirstRegisterSetter(Reference<AVM2Instruction> assignment, int classIndex, boolean isStatic, int scriptIndex, ABC abc, MethodBody body, Set<Integer> ignoredRegisters, Set<Integer> ignoredGets) throws InterruptedException {