LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 17:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #50 AS1/2 function body deobfuscation bug

Browse Source
This commit is contained in:
Jindra Pet��k
2013-03-31 19:26:37 +02:00
parent be106cc34b
commit 3472cc79d2
30 changed files with 474 additions and 821 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java
+16 -8
View File
@@ -16,6 +16,7 @@
*/
package com.jpexs.decompiler.flash.action.swf5;
import com.jpexs.decompiler.flash.ReReadableInputStream;
import com.jpexs.decompiler.flash.SWFInputStream;
import com.jpexs.decompiler.flash.SWFOutputStream;
import com.jpexs.decompiler.flash.action.Action;
@@ -40,24 +41,26 @@ public class ActionWith extends Action implements ActionContainer {
return actions;
}
public ActionWith(SWFInputStream sis, int version) throws IOException {
public ActionWith(SWFInputStream sis, ReReadableInputStream rri, int version) throws IOException {
super(0x94, 2);
size = sis.readUI16();
this.version = version;
//actions = new ArrayList<Action>();
actions = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(size)), version)).readActionList();
actions = (new SWFInputStream(new ByteArrayInputStream(sis.readBytes(size)), version)).readActionList(rri.getPos(), containerSWFOffset + getAddress() + 2, rri, size);
}
public ActionWith(boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
public ActionWith(long containerSWFPos, boolean ignoreNops, List<Label> labels, long address, FlasmLexer lexer, List<String> constantPool, int version) throws IOException, ParseException {
super(0x94, 2);
lexBlockOpen(lexer);
actions = ASMParser.parse(ignoreNops, labels, address + 5, lexer, constantPool, version);
actions = ASMParser.parse(containerSWFPos + 2, ignoreNops, labels, address + 5, lexer, constantPool, version);
}
@Override
public void setAddress(long address, int version) {
super.setAddress(address, version);
Action.setActionsAddresses(actions, address + 5, version);
public void setAddress(long address, int version, boolean recursive) {
super.setAddress(address, version, recursive);
if (recursive) {
Action.setActionsAddresses(actions, address + 5, version);
}
}
@Override
@@ -93,7 +96,7 @@ public class ActionWith extends Action implements ActionContainer {
@Override
public String getASMSource(List<Long> knownAddreses, List<String> constantPool, int version, boolean hex) {
return "With {\r\n" + Action.actionsToString(actions, knownAddreses, constantPool, version, hex) + "}";
return "With {\r\n" + Action.actionsToString(getAddress() + 2, actions, knownAddreses, constantPool, version, hex, containerSWFOffset + getAddress() + 2) + "}";
}
@Override
@@ -105,4 +108,9 @@ public class ActionWith extends Action implements ActionContainer {
public List<Action> getAllIfsOrJumps() {
return Action.getActionsAllIfsOrJumps(actions);
}
@Override
public int getDataLength() {
return size;
}
}