migrate to jd-util-1.1.7 - cleanup bytecode (#296)

* migrate to jd-util-1.1.7 - cleanup bytecode * fix visit(Types types) --------- Co-authored-by: nbauma109 <[email protected]>
nbauma109 · May 26, 2023 · 276c820 · 276c820
1 parent 22b0f65
commit 276c820
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -138,7 +138,7 @@
     <dependency>
       <groupId>com.github.nbauma109</groupId>
       <artifactId>jd-util</artifactId>
-      <version>1.1.16</version>
+      <version>1.1.17</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/src/main/java/jd/core/process/deserializer/ClassFileDeserializer.java b/src/main/java/jd/core/process/deserializer/ClassFileDeserializer.java
@@ -35,6 +35,7 @@
 import jd.core.model.classfile.ConstantPool;
 import jd.core.model.classfile.Field;
 import jd.core.model.classfile.Method;
+import jd.core.process.analyzer.instruction.bytecode.util.ByteCodeUtil;
 
 public final class ClassFileDeserializer
 {
@@ -164,6 +165,14 @@ private static ClassFile deserialize(DataInputStream di, Loader loader, String i
         Field[] fieldInfos = Stream.of(javaClass.getFields()).map(Field::new).toArray(Field[]::new);
         Method[] methodInfos = Stream.of(javaClass.getMethods()).map(Method::new).toArray(Method[]::new);
 
+        for (Method method : methodInfos) {
+            byte[] methodCode = method.getCode();
+            if (methodCode == null) {
+                continue;
+            }
+            ByteCodeUtil.cleanUpByteCode(methodCode);
+        }
+
         return new ClassFile(
                 javaClass.getMinor(),
                 javaClass.getMajor(),

diff --git a/src/main/java/jd/core/process/writer/visitor/SourceWriterVisitor.java b/src/main/java/jd/core/process/writer/visitor/SourceWriterVisitor.java
@@ -24,7 +24,7 @@
 import org.apache.bcel.classfile.ConstantNameAndType;
 import org.apache.commons.lang3.Validate;
 import org.jd.core.v1.api.loader.Loader;
-import org.jd.core.v1.model.javasyntax.AbstractJavaSyntaxVisitor;
+import org.jd.core.v1.model.javasyntax.type.AbstractTypeArgumentVisitor;
 import org.jd.core.v1.model.javasyntax.type.BaseType;
 import org.jd.core.v1.model.javasyntax.type.BaseTypeArgument;
 import org.jd.core.v1.model.javasyntax.type.BaseTypeParameter;
@@ -34,6 +34,8 @@
 import org.jd.core.v1.model.javasyntax.type.Type;
 import org.jd.core.v1.model.javasyntax.type.TypeArgumentVisitable;
 import org.jd.core.v1.model.javasyntax.type.TypeArguments;
+import org.jd.core.v1.model.javasyntax.type.TypeVisitor;
+import org.jd.core.v1.model.javasyntax.type.Types;
 import org.jd.core.v1.model.javasyntax.type.WildcardExtendsTypeArgument;
 import org.jd.core.v1.model.javasyntax.type.WildcardSuperTypeArgument;
 import org.jd.core.v1.model.javasyntax.type.WildcardTypeArgument;
@@ -111,7 +113,7 @@
 import jd.core.util.StringUtil;
 import jd.core.util.UtilConstants;
 
-public class SourceWriterVisitor extends AbstractJavaSyntaxVisitor
+public class SourceWriterVisitor extends AbstractTypeArgumentVisitor implements TypeVisitor
 {
     private static final String[] CMP_NAMES = {
             "==", "<", ">", "", "!", "<=", ">=", "!=" };
@@ -2725,4 +2727,7 @@ protected <T extends TypeArgumentVisitable> void printTokensForList(List<T> list
             }
         }
     }
+
+    @Override
+    public void visit(Types types) {}
 }