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

action deobfuscator improved again

Browse Source
This commit is contained in:
honfika@gmail.com
2015-09-25 18:20:27 +02:00
parent 079cf8a56c
commit 21f5d548cf
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/deobfuscation/ActionDeobfuscator.java
View File

@@ -160,7 +160,9 @@ public class ActionDeobfuscator extends ActionDeobfuscatorSimple {
}
ExecutionResult result = new ExecutionResult();
executeActions(actions, i, idx, cPool, result, fakeFunctions);
// allow uninitialized variables only when the code is execuded from the first line
executeActions(actions, i, idx, cPool, result, fakeFunctions, i == 0);
if (result.idx != -1 && result.resultValue == null) {
int newIstructionCount = 1; // jump
@@ -253,7 +255,7 @@ public class ActionDeobfuscator extends ActionDeobfuscatorSimple {
return cPool;
}
private void executeActions(ActionList actions, int idx, int endIdx, ActionConstantPool constantPool, ExecutionResult result, Map<String, Object> fakeFunctions) throws InterruptedException {
private void executeActions(ActionList actions, int idx, int endIdx, ActionConstantPool constantPool, ExecutionResult result, Map<String, Object> fakeFunctions, boolean allowGetUninitializedVariables) throws InterruptedException {
List<GraphTargetItem> output = new ArrayList<>();
ActionLocalData localData = new ActionLocalData();
FixItemCounterTranslateStack stack = new FixItemCounterTranslateStack("");
@@ -306,7 +308,7 @@ public class ActionDeobfuscator extends ActionDeobfuscatorSimple {
}
String variableName = variableNameObj.getResult().toString();
if (!localData.variables.containsKey(variableName)) {
if (!localData.variables.containsKey(variableName) && !allowGetUninitializedVariables) {
break;
}
}
@@ -500,7 +502,7 @@ public class ActionDeobfuscator extends ActionDeobfuscatorSimple {
ExecutionResult result = new ExecutionResult();
List<Action> lastActions = actions.getContainerLastActions(action);
int lastActionIdx = actions.getIndexByAction(lastActions.get(0));
executeActions(actions, i + 1, lastActionIdx, null, result, null);
executeActions(actions, i + 1, lastActionIdx, null, result, null, false);
if (result.resultValue != null) {
results.put(def.functionName, result.resultValue);
for (int j = i; j <= lastActionIdx; j++) {