remove init obfuscation at all

radioegor146 · May 31, 2022 · 46454ba · 46454ba
1 parent b597177
commit 46454ba
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 52 deletions.
diff --git a/obfuscator/src/main/java/by/radioegor146/MethodContext.java b/obfuscator/src/main/java/by/radioegor146/MethodContext.java
@@ -27,7 +27,6 @@ public class MethodContext {
     public ArrayList<Type> argTypes;
 
     public int line;
-    public int invokeSpecialId;
     public List<Integer> stack;
     public List<Integer> locals;
     public Set<TryCatchBlockNode> tryCatches;
@@ -51,7 +50,7 @@ public MethodContext(NativeObfuscator obfuscator, MethodNode method, int methodI
         this.output = new StringBuilder();
         this.nativeMethods = new StringBuilder();
 
-        this.line = this.invokeSpecialId = -1;
+        this.line = -1;
         this.stack = new ArrayList<>();
         this.locals = new ArrayList<>();
         this.tryCatches = new HashSet<>();

diff --git a/obfuscator/src/main/java/by/radioegor146/MethodProcessor.java b/obfuscator/src/main/java/by/radioegor146/MethodProcessor.java
@@ -3,7 +3,6 @@
 import by.radioegor146.instructions.*;
 import by.radioegor146.special.ClInitSpecialMethodProcessor;
 import by.radioegor146.special.DefaultSpecialMethodProcessor;
-import by.radioegor146.special.InitSpecialMethodProcessor;
 import by.radioegor146.special.SpecialMethodProcessor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
@@ -82,7 +81,7 @@ private <T extends AbstractInsnNode> void addHandler(int id, InstructionTypeHand
     private SpecialMethodProcessor getSpecialMethodProcessor(String name) {
         switch (name) {
             case "<init>":
-                return new InitSpecialMethodProcessor();
+                return null;
             case "<clinit>":
                 return new ClInitSpecialMethodProcessor();
             default:
@@ -112,6 +111,10 @@ public void processMethod(MethodContext context) {
 
         SpecialMethodProcessor specialMethodProcessor = getSpecialMethodProcessor(method.name);
 
+        if (specialMethodProcessor == null) {
+            throw new RuntimeException(String.format("Could not find special method processor for %s", method.name));
+        }
+
         output.append("// ").append(Util.escapeCommentString(method.name)).append(Util.escapeCommentString(method.desc)).append("\n");
 
         String methodName = specialMethodProcessor.preProcess(context);
@@ -244,13 +247,6 @@ public void processMethod(MethodContext context) {
 
         for (int instruction = 0; instruction < method.instructions.size(); ++instruction) {
             AbstractInsnNode node = method.instructions.get(instruction);
-
-            if (method.name.equals("<init>") && context.invokeSpecialId == -1) {
-                if (node.getOpcode() == Opcodes.INVOKESPECIAL) {
-                    context.invokeSpecialId = instruction;
-                }
-                continue;
-            }
             context.output.append("    // ").append(Util.escapeCommentString(handlers[node.getType()]
                     .insnToString(context, node))).append("; Stack: ").append(context.stackPointer).append("\n");
             handlers[node.getType()].accept(context, node);

diff --git a/obfuscator/src/main/java/by/radioegor146/special/DefaultSpecialMethodProcessor.java b/obfuscator/src/main/java/by/radioegor146/special/DefaultSpecialMethodProcessor.java
@@ -23,9 +23,6 @@ public void postProcess(MethodContext context) {
         context.method.instructions.clear();
         if (Util.getFlag(context.clazz.access, Opcodes.ACC_INTERFACE)) {
             InsnList list = new InsnList();
-            for (int i = 0; i <= context.invokeSpecialId; i++) {
-                list.add(context.method.instructions.get(i));
-            }
             int localVarsPosition = 0;
             for (Type arg : context.argTypes) {
                 list.add(new VarInsnNode(arg.getOpcode(Opcodes.ILOAD), localVarsPosition));

diff --git a/obfuscator/src/main/java/by/radioegor146/special/InitSpecialMethodProcessor.java b/obfuscator/src/main/java/by/radioegor146/special/InitSpecialMethodProcessor.java
diff --git a/obfuscator/src/test/java/by/radioegor146/ClassicTest.java b/obfuscator/src/test/java/by/radioegor146/ClassicTest.java
@@ -173,7 +173,6 @@ public void execute() throws Throwable {
         } catch (IOException | RuntimeException e) {
             e.printStackTrace(System.err);
             throw e;
-        } finally {
         }
     }