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

Fixed #1972 AS3 Renaming invalid identifiers - '#' character

Browse Source
This commit is contained in:
Jindra Petřík
2023-02-12 22:25:54 +01:00
parent 851dc7e922
commit 14c012ad2f
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/IdentifiersDeobfuscation.java
View File

@@ -222,7 +222,7 @@ public class IdentifiersDeobfuscation {
}
public String deobfuscateNameWithPackage(boolean as3, String n, HashMap<DottedChain, DottedChain> namesMap, RenameType renameType, Map<DottedChain, DottedChain> selected) {
DottedChain nChain = DottedChain.parseWithSuffix(n);
DottedChain nChain = DottedChain.parseNoSuffix(n);
DottedChain pkg = nChain.getWithoutLast();
String name = nChain.getLast();
@@ -340,7 +340,7 @@ public class IdentifiersDeobfuscation {
usageType = "name";
}
DottedChain sChain = DottedChain.parseWithSuffix(s);
DottedChain sChain = DottedChain.parseNoSuffix(s);
if (selected != null) {
if (selected.containsKey(sChain)) {
return selected.get(sChain).toRawString();
@@ -366,14 +366,14 @@ public class IdentifiersDeobfuscation {
ret = fooString(firstUppercase, rndSize);
if (allVariableNamesStr.contains(ret)
|| isReservedWord(ret, as3)
|| namesMap.containsValue(DottedChain.parseWithSuffix(ret))) {
|| namesMap.containsValue(DottedChain.parseNoSuffix(ret))) {
found = true;
rndSize++;
}
}
} while (found);
namesMap.put(DottedChain.parseWithSuffix(s), DottedChain.parseWithSuffix(ret));
namesMap.put(DottedChain.parseNoSuffix(s), DottedChain.parseNoSuffix(ret));
return ret;
}
}

18
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Deobfuscation.java
View File

@@ -93,7 +93,7 @@ public class AVM2Deobfuscation {
return null;
}
private String fooString(HashMap<DottedChain, DottedChain> deobfuscated, String orig, boolean firstUppercase, String usageType, RenameType renameType) {
private String fooString(HashMap<DottedChain, DottedChain> deobfuscated, String orig, boolean firstUppercase, String usageType, RenameType renameType, boolean autoAdd) {
if (usageType == null) {
usageType = "name";
}
@@ -111,12 +111,14 @@ public class AVM2Deobfuscation {
}
if (swf.as3StringConstantExists(ret)
|| IdentifiersDeobfuscation.isReservedWord2(ret)
|| deobfuscated.containsValue(DottedChain.parseWithSuffix(ret))) {
|| deobfuscated.containsValue(DottedChain.parseNoSuffix(ret))) {
found = true;
rndSize++;
}
} while (found);
deobfuscated.put(DottedChain.parseWithSuffix(orig), DottedChain.parseWithSuffix(ret));
if (autoAdd) {
deobfuscated.put(DottedChain.parseNoSuffix(orig), DottedChain.parseNoSuffix(ret));
}
return ret;
}
@@ -141,7 +143,7 @@ public class AVM2Deobfuscation {
for (int p = 0; p < sChain.size(); p++) {
String part = sChain.get(p);
if (!isValidNSPart(part)) {
ret.add(fooString(namesMap, part, false, "package", renameType));
ret.add(fooString(namesMap, part, false, "package", renameType, true));
} else {
ret.add(part);
}
@@ -186,21 +188,21 @@ public class AVM2Deobfuscation {
if (!isValid) {
DottedChain newname;
DottedChain sChain = DottedChain.parseWithSuffix(s);
DottedChain sChain = DottedChain.parseNoSuffix(s);
if (namesMap.containsKey(sChain)) {
newname = namesMap.get(sChain);
return constants.getStringId(newname, true);
}
String str = fooString(namesMap, constants.getString(strIndex), firstUppercase, stringUsageTypes.get(strIndex), renameType);
newname = DottedChain.parseWithSuffix(str);
String str = fooString(namesMap, constants.getString(strIndex), firstUppercase, stringUsageTypes.get(strIndex), renameType, false);
newname = DottedChain.parseNoSuffix(str);
if (stringUsages.contains(strIndex) || namespaceUsages.contains(strIndex)) { // this name is already referenced as String
strIndex = constants.addString(s); // add new index
}
constants.setString(strIndex, newname.toRawString());
if (!namesMap.containsKey(sChain)) {
namesMap.put(sChain, DottedChain.parseWithSuffix(constants.getString(strIndex)));
namesMap.put(sChain, DottedChain.parseNoSuffix(constants.getString(strIndex)));
}
}
return strIndex;