From 99050bc39ad95f5a0633f8748a748a3af4bb8022 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sat, 26 Sep 2015 22:45:02 +0200 Subject: [PATCH] fix --- .../com/jpexs/decompiler/flash/action/FastActionList.java | 7 +++++-- .../action/deobfuscation/ActionDeobfuscatorSimple.java | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/FastActionList.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/FastActionList.java index 8ac34c5ac..1e8f63a21 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/FastActionList.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/FastActionList.java @@ -55,15 +55,18 @@ public class FastActionList { } } - private void updateActionLengths() { + private void updateActionAddressesAndLengths() { + long address = actions.get(0).getAddress(); for (Action action : actions) { + action.setAddress(address); action.updateLength(); + address += action.getTotalActionLength(); } } public ActionList toActionList() { ActionList result = new ActionList(actions); - updateActionLengths(); + updateActionAddressesAndLengths(); return result; } } diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java index 8624b0b5f..036303908 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscatorSimple.java @@ -88,7 +88,6 @@ public class ActionDeobfuscatorSimple implements SWFDecompilerListener { fastActions.expandPushes(); actions.setActions(fastActions.toActionList()); - actions.expandPushes(); removeGetTimes(actions); removeObfuscationIfs(actions); }