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

Multiname collision fixer

Browse Source
This commit is contained in:
Jindra Petřík
2016-09-17 16:19:16 +02:00
parent 112819d464
commit 1253fcbdbf
2 changed files with 81 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/ABC.java
View File

@@ -1118,11 +1118,10 @@ public class ABC {
}
/**
* Appends namespace (#123) suffix to multinames which collide with each
* other. For example same name consts/vars/methods or same class names.
* Gets colliding usages of multinames. For example same name
* consts/vars/methods or same class names. Mostly in obfuscated files.
*/
public void refreshMultinameNamespaceSuffixes() {
public Set<MultinameUsage> getCollidingMultinameUsages() {
//Reset
for (int multinameIndex = 1; multinameIndex < constants.getMultinameCount(); multinameIndex++) {
constants.getMultiname(multinameIndex).setDisplayNamespace(false);
@@ -1163,10 +1162,20 @@ public class ABC {
}
}
}
return collidingUsages;
}
/**
* Appends namespace (#123) suffix to multinames which collide with each
* other. For example same name consts/vars/methods or same class names.
*/
public void refreshMultinameNamespaceSuffixes() {
Set<MultinameUsage> collidingMultinameUsages = getCollidingMultinameUsages();
Set<Integer> collidingMultinameIndices = new HashSet<>();
for (MultinameUsage col : collidingUsages) {
for (MultinameUsage col : collidingMultinameUsages) {
//System.err.println("collides " + col);
collidingMultinameIndices.add(col.multinameIndex);
}

67
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/deobfuscation/AbcMultiNameCollisionFixer.java Normal file
View File

@@ -0,0 +1,67 @@
/*
* Copyright (C) 2010-2016 JPEXS, All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library.
*/
package com.jpexs.decompiler.flash.abc.avm2.deobfuscation;
import com.jpexs.decompiler.flash.SWF;
import com.jpexs.decompiler.flash.abc.ABC;
import com.jpexs.decompiler.flash.abc.types.Multiname;
import com.jpexs.decompiler.flash.abc.usages.MultinameUsage;
import com.jpexs.decompiler.flash.tags.ABCContainerTag;
import com.jpexs.decompiler.flash.tags.Tag;
import java.util.HashSet;
import java.util.Set;
public class AbcMultiNameCollisionFixer {
public int fixCollisions(SWF swf) {
int ret = 0;
for (ABCContainerTag tag : swf.getAbcList()) {
ret += this.fixCollisions(tag.getABC());
}
return ret;
}
public int fixCollisions(ABC abc) {
Set<MultinameUsage> collidingUsages = abc.getCollidingMultinameUsages();
Set<Integer> collidingMultinameIndices = new HashSet<>();
for (MultinameUsage usage : collidingUsages) {
collidingMultinameIndices.add(usage.getMultinameIndex());
}
Set<String> newNames = new HashSet<>();
int ret = 0;
for (int multiNameIndex : collidingMultinameIndices) {
Multiname multiName = abc.constants.getMultiname(multiNameIndex);
String oldName = abc.constants.getString(multiName.name_index);
String selectedBaseName = oldName + "_" + multiName.namespace_index;
String selectedName = selectedBaseName;
int cnt = 0;
while (!newNames.contains(selectedName) && abc.constants.getStringId(selectedName, false) > -1) { //already exists such name, but was not added during this collisionFixes
cnt++;
selectedName = selectedBaseName + "_" + cnt;
}
newNames.add(selectedName);
int newNameIndex = abc.constants.getStringId(selectedName, true);
multiName.name_index = newNameIndex;
//TODO: fix all similar multinames
ret++;
}
if (ret > 0) {
((Tag) abc.parentTag).setModified(true);
}
return ret;
}
}