From 60f7e5e36fdc4311a5827670cddec5a34bf43d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 20 Sep 2014 21:09:43 +0200 Subject: [PATCH] AS1/2 loops compilation fix --- .../flash/action/parser/script/ActionSourceGenerator.java | 4 ++-- .../jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java index b494859ea..e8f2385ee 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionSourceGenerator.java @@ -181,8 +181,8 @@ public class ActionSourceGenerator implements SourceGenerator { private void fixLoop(List code, int breakOffset, int continueOffset) { int pos = 0; - for (Action a : code) { - pos += a.getTotalActionLength(); + for (Action a : code) { + pos += a.getBytes(SWF.DEFAULT_VERSION).length; if (a instanceof ActionJump) { ActionJump aj = (ActionJump) a; if (aj.isContinue && (continueOffset != Integer.MAX_VALUE)) { diff --git a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java index 6eb2bf6db..e3b2db041 100644 --- a/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java +++ b/libsrc/ffdec_lib/test/com/jpexs/decompiler/flash/ActionScript2DeobfuscatorTest.java @@ -216,8 +216,8 @@ public class ActionScript2DeobfuscatorTest extends ActionStript2TestBase { } if(res.contains("\"FAIL3\"")){ fail("unreachable if onTrue 3 not removed"); - } - if(!res.contains("\"OK\"")){ + } + if(!res.contains("\"OK\"")){ fail("reachable of onTrue removed"); } }