From 3d092df4effb9443ea92c05aac9c3ee8c63e4b7d Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Sat, 29 Nov 2014 11:00:29 +0100 Subject: [PATCH] another AS2 deobfscation fix --- .../flash/action/deobfuscation/ActionDeobfuscatorSimple.java | 2 ++ libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 55f2fd848..170df4fbb 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 @@ -25,6 +25,7 @@ import com.jpexs.decompiler.flash.action.ActionLocalData; import com.jpexs.decompiler.flash.action.model.DirectValueActionItem; import com.jpexs.decompiler.flash.action.special.ActionStore; import com.jpexs.decompiler.flash.action.swf4.ActionAdd; +import com.jpexs.decompiler.flash.action.swf4.ActionCharToAscii; import com.jpexs.decompiler.flash.action.swf4.ActionEquals; import com.jpexs.decompiler.flash.action.swf4.ActionIf; import com.jpexs.decompiler.flash.action.swf4.ActionJump; @@ -236,6 +237,7 @@ public class ActionDeobfuscatorSimple implements SWFDecompilerListener { if (!(action instanceof ActionPush || action instanceof ActionPushDuplicate + || action instanceof ActionCharToAscii || action instanceof ActionAdd || action instanceof ActionAdd2 || action instanceof ActionSubtract diff --git a/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java b/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java index c94c13db3..348ba4e71 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java +++ b/libsrc/ffdec_lib/src/com/jpexs/helpers/Helper.java @@ -170,7 +170,7 @@ public class Helper { } else if (c == '\'') { ret.append("\\'"); } else if (c < 32) { - ret.append("\\x").append(padZeros(Integer.toHexString(i), 2)); + ret.append("\\x").append(padZeros(Integer.toHexString((int) c), 2)); } else { ret.append(c); }