LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-07-02 18:44:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed AS 1/2 - do not use eval function on obfuscated increment/decrement

Browse Source
This commit is contained in:
Jindra Petřík
2021-11-20 11:07:38 +01:00
parent a66daea33d
commit 4070ada026
2 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/swf4/ActionSetVariable.java
View File

@@ -84,6 +84,9 @@ public class ActionSetVariable extends Action implements StoreTypeAction {
GraphTargetItem obj = ((IncrementActionItem) value).object;
if (!stack.isEmpty() && stack.peek().valueEquals(obj)) {
stack.pop();
if (obj instanceof GetVariableActionItem) {
((GetVariableActionItem) obj).printObfuscatedName = true;
}
stack.push(new PostIncrementActionItem(this, lineStartAction, obj));
return;
}
@@ -92,6 +95,9 @@ public class ActionSetVariable extends Action implements StoreTypeAction {
GraphTargetItem obj = ((DecrementActionItem) value).object;
if (!stack.isEmpty() && stack.peek().valueEquals(obj)) {
stack.pop();
if (obj instanceof GetVariableActionItem) {
((GetVariableActionItem) obj).printObfuscatedName = true;
}
stack.push(new PostDecrementActionItem(this, lineStartAction, obj));
return;
}
@@ -99,6 +105,10 @@ public class ActionSetVariable extends Action implements StoreTypeAction {
if (value instanceof IncrementActionItem) {
if (((IncrementActionItem) value).object instanceof GetVariableActionItem) {
if (((GetVariableActionItem) ((IncrementActionItem) value).object).name.valueEquals(name)) {
if (((IncrementActionItem) value).object instanceof GetVariableActionItem) {
((GetVariableActionItem) ((IncrementActionItem) value).object).printObfuscatedName = true;
}
output.add(new PostIncrementActionItem(this, lineStartAction, ((IncrementActionItem) value).object));
return;
}
@@ -107,6 +117,9 @@ public class ActionSetVariable extends Action implements StoreTypeAction {
if (value instanceof DecrementActionItem) {
if (((DecrementActionItem) value).object instanceof GetVariableActionItem) {
if (((GetVariableActionItem) ((DecrementActionItem) value).object).name.valueEquals(name)) {
if (((DecrementActionItem) value).object instanceof GetVariableActionItem) {
((GetVariableActionItem) ((DecrementActionItem) value).object).printObfuscatedName = true;
}
output.add(new PostDecrementActionItem(this, lineStartAction, ((DecrementActionItem) value).object));
return;
}
@@ -141,12 +154,14 @@ public class ActionSetVariable extends Action implements StoreTypeAction {
if (value instanceof IncrementActionItem) {
if (((IncrementActionItem) value).object instanceof GetVariableActionItem) {
if (((GetVariableActionItem) ((IncrementActionItem) value).object).name.valueEquals(name)) {
((GetVariableActionItem) ((IncrementActionItem) value).object).printObfuscatedName = true;
ret = new PreIncrementActionItem(this, lineStartAction, ((IncrementActionItem) value).object);
}
}
} else if (value instanceof DecrementActionItem) {
if (((DecrementActionItem) value).object instanceof GetVariableActionItem) {
if (((GetVariableActionItem) ((DecrementActionItem) value).object).name.valueEquals(name)) {
((GetVariableActionItem) ((DecrementActionItem) value).object).printObfuscatedName = true;
ret = new PreDecrementActionItem(this, lineStartAction, ((DecrementActionItem) value).object);
}
}