LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-27 12:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1951 Renaming invalid identifiers with existing string collisions

Browse Source
This commit is contained in:
Jindra Petřík
2023-01-30 22:33:36 +01:00
parent 4a5cef7a3a
commit 0469170810
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Deobfuscation.java
+19 -17
View File
@@ -134,26 +134,26 @@ public class AVM2Deobfuscation {
DottedChain newName;
if (namesMap.containsKey(sChain)) {
newName = namesMap.get(sChain);
constants.setString(strIndex, newName.toRawString());
} else {
List<String> ret = new ArrayList<>();
for (int p = 0; p < sChain.size(); p++) {
String part = sChain.get(p);
if (!isValidNSPart(part)) {
ret.add(fooString(namesMap, part, false, "package", renameType));
} else {
ret.add(part);
}
}
newName = new DottedChain(ret);
namesMap.put(sChain, newName);
return constants.getStringId(newName.toRawString(), true); //constants.setString(strIndex, newName.toRawString());
}
List<String> ret = new ArrayList<>();
for (int p = 0; p < sChain.size(); p++) {
String part = sChain.get(p);
if (!isValidNSPart(part)) {
ret.add(fooString(namesMap, part, false, "package", renameType));
} else {
ret.add(part);
}
}
newName = new DottedChain(ret);
namesMap.put(sChain, newName);
if (stringUsages.contains(strIndex)) {
strIndex = constants.addString(newName.toRawString());
} else {
constants.setString(strIndex, newName.toRawString());
}
}
return strIndex;
}
@@ -189,10 +189,12 @@ public class AVM2Deobfuscation {
DottedChain sChain = DottedChain.parseWithSuffix(s);
if (namesMap.containsKey(sChain)) {
newname = namesMap.get(sChain);
} else {
String str = fooString(namesMap, constants.getString(strIndex), firstUppercase, stringUsageTypes.get(strIndex), renameType);
newname = DottedChain.parseWithSuffix(str);
return constants.getStringId(newname, true);
}
String str = fooString(namesMap, constants.getString(strIndex), firstUppercase, stringUsageTypes.get(strIndex), renameType);
newname = DottedChain.parseWithSuffix(str);
if (stringUsages.contains(strIndex) || namespaceUsages.contains(strIndex)) { // this name is already referenced as String
strIndex = constants.addString(s); // add new index
}