Add workaround for invalid signatures

cherry-pick from ThexXTURBOXx@f1da047
pxb1988 · Oct 30, 2021 · 5e4c90f · 5e4c90f
1 parent c577db0
commit 5e4c90f
Showing 1 changed file with 25 additions and 4 deletions.
diff --git a/dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2Asm.java b/dex-translator/src/main/java/com/googlecode/d2j/dex/Dex2Asm.java
@@ -275,7 +275,16 @@ private static MethodVisitor collectBasicMethodInfo(DexMethodNode methodNode, Cl
         // clear ACC_DECLARED_SYNCHRONIZED and ACC_CONSTRUCTOR from method flags
         final int cleanFlag = ~((DexConstants.ACC_DECLARED_SYNCHRONIZED | DexConstants.ACC_CONSTRUCTOR));
         access &= cleanFlag;
-        return cv.visitMethod(access, methodNode.method.getName(), methodNode.method.getDesc(), signature, xthrows);
+        try {
+            return cv.visitMethod(access, methodNode.method.getName(), methodNode.method.getDesc(), signature, xthrows);
+        } catch (StringIndexOutOfBoundsException | IllegalArgumentException e) {
+            System.err.println("Applying workaround to method "
+                    + methodNode.method.getOwner() + "#" + methodNode.method.getName()
+                    + " with original signature " + signature
+                    + " by changing its types to java.lang.Object.");
+            return cv.visitMethod(access, methodNode.method.getName(), methodNode.method.getDesc(),
+                    "(Ljava/lang/Object;)Ljava/lang/Object;", xthrows);
+        }
     }
 
     protected static Map<String, Clz> collectClzInfo(DexFileNode fileNode) {
@@ -523,9 +532,21 @@ public void convertField(DexClassNode classNode, DexFieldNode fieldNode, ClassVi
             }
         }
         Object value = convertConstantValue(fieldNode.cst);
-        final int FieldCleanFlag = ~DexConstants.ACC_DECLARED_SYNCHRONIZED;
-        FieldVisitor fv = cv.visitField(fieldNode.access & FieldCleanFlag, fieldNode.field.getName(),
-                fieldNode.field.getType(), signature, value);
+
+        final int fieldCleanFlag = ~((DexConstants.ACC_DECLARED_SYNCHRONIZED | Opcodes.ACC_SYNTHETIC));
+        FieldVisitor fv;
+        try {
+            fv = cv.visitField(fieldNode.access & fieldCleanFlag, fieldNode.field.getName(),
+                    fieldNode.field.getType(), signature, value);
+        } catch (StringIndexOutOfBoundsException | IllegalArgumentException e) {
+            System.err.println("Applying workaround to field "
+                    + classNode.className + "#" + fieldNode.field.getName()
+                    + " with original signature " + signature
+                    + " by changing its type to java.lang.Object.");
+            fv = cv.visitField(fieldNode.access & fieldCleanFlag, fieldNode.field.getName(),
+                    fieldNode.field.getType(), "Ljava/lang/Object;", value);
+        }
+
         if (fv == null) {
             return;
         }