Magic-Mirror/dex2jar
1
0
Fork 0
mirror of https://github.com/pxb1988/dex2jar.git synced 2024-11-23 13:19:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

warn invalid inner class name

Browse Source 
--HG--
branch : 2.x
This commit is contained in:
Bob Pan 2015-01-05 22:17:02 +08:00
parent 59f17b8181
commit e49954870e
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2Asm.java
View File

@ -324,6 +324,21 @@ public class Dex2Asm {
convertClass(classNode, cvf, new HashMap<String, Clz>());
}
private static boolean isJavaIdentifier(String str) {
if (str.length() < 1) {
return false;
}
if (!Character.isJavaIdentifierStart(str.charAt(0))) {
return false;
}
for (int i = 1; i < str.length(); i++) {
if (!Character.isJavaIdentifierPart(str.charAt(i))) {
return false;
}
}
return true;
}
public void convertClass(DexClassNode classNode, ClassVisitorFactory cvf, Map<String, Clz> classes) {
ClassVisitor cv = cvf.create(toInternalName(classNode.className));
if (cv == null) {
@ -391,6 +406,11 @@ public class Dex2Asm {
}
Collections.sort(innerClassNodes, INNER_CLASS_NODE_COMPARATOR);
for (InnerClassNode icn : innerClassNodes) {
if (icn.innerName != null && !isJavaIdentifier(icn.innerName)) {
System.err.println("WARN: ignored invalid inner class name " + ", treat as anonymous inner class.");
icn.innerName = null;
icn.outerName = null;
}
icn.accept(cv);
}