Handle special case where we cannot determine if it is INVOKEVIRTUAL or INVOKEINTERFACE

Author: EpicPlayerA10

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/context/Context.java

@@ -13,6 +13,8 @@
 import uwu.narumi.deobfuscator.api.asm.ClassWrapper;
 import uwu.narumi.deobfuscator.api.classpath.ClassProvider;
 import uwu.narumi.deobfuscator.api.classpath.ClassInfoStorage;
+import uwu.narumi.deobfuscator.api.classpath.CombinedClassProvider;
+import uwu.narumi.deobfuscator.api.classpath.JvmClassProvider;
 import uwu.narumi.deobfuscator.api.execution.SandBox;
 import uwu.narumi.deobfuscator.api.helper.ClassHelper;
 
@@ -136,4 +138,11 @@ public Map<String, ClassWrapper> getClassesMap() {
   public Map<String, byte[]> getFilesMap() {
     return filesMap;
   }
+
+  /**
+   * Gets the class provider that holds all classes in the context, including the jvm runtime.
+   */
+  public ClassProvider getFullClassProvider() {
+    return new CombinedClassProvider(this, this.getLibraries(), JvmClassProvider.INSTANCE);
+  }
 }

deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/qprotect/qProtectInvokeDynamicTransformer.java

@@ -2,6 +2,7 @@
 
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
+import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.InvokeDynamicInsnNode;
 import org.objectweb.asm.tree.LdcInsnNode;
 import org.objectweb.asm.tree.LookupSwitchInsnNode;
@@ -42,6 +43,8 @@ protected void transform() throws Exception {
             // Decrypt the method invocation
             AbstractInsnNode decryptedInsn = decryptMethodInvocation(xorKey, encryptedData, decryptionInfo);
             methodNode.instructions.set(invokeDynamicInsn, decryptedInsn);
+
+            markChange();
           }
         }
       });
@@ -95,7 +98,7 @@ private DecryptionInfo extractDecryptionInformation(InvokeDynamicInsnNode invoke
    * @param decryptionInfo Decryption information
    * @return Decrypted method invocation instruction
    */
-  private static AbstractInsnNode decryptMethodInvocation(String xorKey, String encryptedData, DecryptionInfo decryptionInfo) {
+  private AbstractInsnNode decryptMethodInvocation(String xorKey, String encryptedData, DecryptionInfo decryptionInfo) {
     char[] xorKeyArr = xorKey.toCharArray();
 
     // Decrypt the data using XOR cipher
@@ -133,7 +136,21 @@ private static AbstractInsnNode decryptMethodInvocation(String xorKey, String en
     }
 
     int opcode = decryptionInfo.invocationTypes().get(methodType);
-    return new MethodInsnNode(opcode, opcode == INVOKESPECIAL ? specialClass : ownerClass, methodName, methodDesc, false);
+
+    // Handle special case where we cannot determine if it is INVOKEVIRTUAL or INVOKEINTERFACE
+    if (opcode == INVOKEVIRTUAL) {
+      ClassNode classInfo = context().getFullClassProvider().getClassInfo(ownerClass);
+      if (classInfo != null) {
+        // Check if class is an interface
+        if (isAccess(classInfo.access, ACC_INTERFACE)) {
+          opcode = INVOKEINTERFACE;
+        }
+      } else {
+        LOGGER.warn("Could not find class {} for class/interface type detection. If you want a runnable jar then add the required lib.", ownerClass);
+      }
+    }
+
+    return new MethodInsnNode(opcode, opcode == INVOKESPECIAL ? specialClass : ownerClass, methodName, methodDesc, opcode == INVOKEINTERFACE);
   }
 
   /**