fix static field inliner

narumii · Oct 18, 2024 · ff2d17a · ff2d17a
1 parent 07ada75
commit ff2d17a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 3 deletions.
diff --git a/...s/src/main/java/uwu/narumi/deobfuscator/core/other/composed/ComposedHP888Transformer.java b/...s/src/main/java/uwu/narumi/deobfuscator/core/other/composed/ComposedHP888Transformer.java
@@ -2,9 +2,10 @@
 
 import org.jetbrains.annotations.Nullable;
 import uwu.narumi.deobfuscator.api.transformer.ComposedTransformer;
-import uwu.narumi.deobfuscator.core.other.composed.general.ComposedGeneralRepairTransformer;
+import uwu.narumi.deobfuscator.core.other.impl.clean.LocalVariableNamesCleanTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.hp888.HP888PackerTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.hp888.HP888StringTransformer;
+import uwu.narumi.deobfuscator.core.other.impl.universal.AccessRepairTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.universal.RecoverSyntheticsTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.universal.UniversalNumberTransformer;
 
@@ -31,7 +32,8 @@ public ComposedHP888Transformer(@Nullable String encryptedClassFilesSuffix) {
 
         // Cleanup
         UniversalNumberTransformer::new,
-        ComposedGeneralRepairTransformer::new,
+        AccessRepairTransformer::new,
+        LocalVariableNamesCleanTransformer::new,
         RecoverSyntheticsTransformer::new
     );
   }

diff --git a/.../main/java/uwu/narumi/deobfuscator/core/other/impl/pool/InlineStaticFieldTransformer.java b/.../main/java/uwu/narumi/deobfuscator/core/other/impl/pool/InlineStaticFieldTransformer.java
@@ -13,8 +13,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Inlines constant static fields
@@ -23,7 +25,7 @@ public class InlineStaticFieldTransformer extends Transformer {
 
   @Override
   protected void transform() throws Exception {
-    List<FieldRef> notConstantFields = new ArrayList<>();
+    Set<FieldRef> notConstantFields = new HashSet<>();
     Map<FieldRef, AbstractInsnNode> staticConstantFields = new HashMap<>();
 
     // Find all static constant fields
@@ -55,6 +57,8 @@ protected void transform() throws Exception {
             if (valueInsn.isConstant()) {
               // We have constant static field
               staticConstantFields.put(FieldRef.of(insn), valueInsn);
+            } else {
+              notConstantFields.add(fieldRef);
             }
           });
     }));

diff --git a/testData/results/custom-classes/hp888/pack/MyFunction2.dec b/testData/results/custom-classes/hp888/pack/MyFunction2.dec
diff --git a/testData/results/java/TestInlineStaticFields.dec b/testData/results/java/TestInlineStaticFields.dec
@@ -1,15 +1,25 @@
 public class TestInlineStaticFields {
     public static int TEST1 = 123;
     public static int TEST4;
+    public static String TEST5;
 
     public static void test() {
         System.out.println(TEST1);
         System.out.println("placki");
         System.out.println(true);
         System.out.println(TEST4);
+        System.out.println(TEST5.toUpperCase());
     }
 
     public static void modifyStatic() {
         TEST1 = 321;
     }
+
+    static {
+        try {
+            TEST5 = Number.class.getSimpleName();
+        } catch (Exception var1) {
+            TEST5 = null;
+        }
+    }
 }
diff --git a/testData/src/java/src/main/java/TestInlineStaticFields.java b/testData/src/java/src/main/java/TestInlineStaticFields.java
@@ -3,12 +3,23 @@ public class TestInlineStaticFields {
   public static String TEST2 = "placki";
   public static boolean TEST3 = true;
   public static int TEST4;
+  public static String TEST5;
+
+  static {
+    try {
+      TEST5 = Number.class.getSimpleName();
+    } catch (Exception e) {
+      TEST5 = null;
+    }
+  }
 
   public static void test() {
     System.out.println(TEST1);
     System.out.println(TEST2);
     System.out.println(TEST3);
     System.out.println(TEST4);
+
+    System.out.println(TEST5.toUpperCase());
   }
 
   public static void modifyStatic() {