LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-25 10:36:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1972 AS3 Renaming invalid identifiers - various fixes

Browse Source 
Fixed #1972 AS3 imports taken only from packages, not package internal
This commit is contained in:
Jindra Petřík
2023-02-14 22:10:17 +01:00
parent 45a7d36067
commit 08456da845
5 changed files with 124 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/SWF.java
View File

@@ -2690,9 +2690,23 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
}
public int deobfuscateAS3Identifiers(RenameType renameType) {
Map<Tag, Map<Integer, String>> stringUsageTypesMap = new HashMap<>();
Map<Tag, Set<Integer>> stringUsagesMap = new HashMap<>();
informListeners("deobfuscate", "Getting usages...");
for (Tag tag : getTags()) {
if (tag instanceof ABCContainerTag) {
((ABCContainerTag) tag).getABC().deobfuscateIdentifiers(deobfuscated, renameType, true);
if (tag instanceof ABCContainerTag) {
Map<Integer, String> stringUsageTypes = new HashMap<>();
Set<Integer> stringUsages = ((ABCContainerTag)tag).getABC().getStringUsages();
((ABCContainerTag)tag).getABC().getStringUsageTypes(stringUsageTypes);
stringUsageTypesMap.put(tag, stringUsageTypes);
stringUsagesMap.put(tag, stringUsages);
}
}
for (Tag tag : getTags()) {
if (tag instanceof ABCContainerTag) {
((ABCContainerTag) tag).getABC().deobfuscateIdentifiers(stringUsageTypesMap.get(tag),stringUsagesMap.get(tag), deobfuscated, renameType, true);
((ABCContainerTag) tag).getABC().constants.clearCachedMultinames();
((ABCContainerTag) tag).getABC().constants.clearCachedDottedChains();
tag.setModified(true);
@@ -2700,7 +2714,7 @@ public final class SWF implements SWFContainerItem, Timelined, Openable {
}
for (Tag tag : getTags()) {
if (tag instanceof ABCContainerTag) {
((ABCContainerTag) tag).getABC().deobfuscateIdentifiers(deobfuscated, renameType, false);
((ABCContainerTag) tag).getABC().deobfuscateIdentifiers(stringUsageTypesMap.get(tag),stringUsagesMap.get(tag), deobfuscated, renameType, false);
((ABCContainerTag) tag).getABC().constants.clearCachedMultinames();
((ABCContainerTag) tag).getABC().constants.clearCachedDottedChains();
tag.setModified(true);