Fall back to getting class file bytes when dumping class to bytes fails

Author: rcx

src/main/java/club/bytecode/the/jda/JDA.java

@@ -224,6 +224,15 @@ public static boolean hasFile(ViewerFile file) {
             return false;
         return file.container.getFiles().containsKey(file.name);
     }
+
+    // try to get class bytes by exporting classnode, else fallback to getting the bytes from the actual file itself
+    public static byte[] getClassBytes(FileContainer container, ClassNode cn) {
+        byte[] result = dumpClassToBytes(cn);
+        if (result != null)
+            return result;
+        result = getClassFileBytes(container, cn.name);
+        return result;
+    }
 
     public static byte[] getClassFileBytes(FileContainer container, String className) {
         byte[] bytes = getFileBytes(new ViewerFile(container, container.findClassfile(className)));
@@ -234,9 +243,15 @@ public static byte[] getClassFileBytes(FileContainer container, String className
 
     public static byte[] dumpClassToBytes(ClassNode cn) {
         // we have to do this, or else decompile filters don't work.
-        ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
-        cn.accept(writer);
-        return writer.toByteArray();
+        try {
+            ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
+            cn.accept(writer);
+            return writer.toByteArray();
+        } catch (Exception e) {
+            System.err.println("Exception while dumping class " + cn.name + ": ");
+            e.printStackTrace();
+            return null;
+        }
     }
 
     public static final String HACK_PREFIX = "\0JDA-hack";

src/main/java/club/bytecode/the/jda/decompilers/CFRDecompiler.java

@@ -98,7 +98,7 @@ public JDANamespace getNamespace() {
     @Override
     public String decompileClassNode(FileContainer container, ClassNode cn) {
         try {
-            byte[] bytes = JDA.dumpClassToBytes(cn);
+            byte[] bytes = JDA.getClassBytes(container, cn);
             Options options = new GetOptParser().parse(generateMainMethod(), OptionsImpl.getFactory());
             ClassFileSourceImpl classFileSource = new ClassFileSourceImpl(options);
             DCCommonState dcCommonState = new DCCommonState(options, classFileSource);

src/main/java/club/bytecode/the/jda/decompilers/FernflowerDecompiler.java

@@ -81,7 +81,7 @@ public String decompileClassNode(FileContainer container, final ClassNode cn) {
                     applyFilters(requestedCn);
                     classCache.put(className, requestedCn);
                 }
-                return JDA.dumpClassToBytes(requestedCn);
+                return JDA.getClassBytes(container, requestedCn);
             }, new IResultSaver() {
                 @Override
                 public void saveFolder(String s) {

src/main/java/club/bytecode/the/jda/decompilers/ProcyonDecompiler.java

@@ -77,7 +77,7 @@ public DecompilerSettings getDecompilerSettings() {
     @Override
     public String decompileClassNode(FileContainer container, final ClassNode cn) {
         try {
-            byte[] bytes = JDA.dumpClassToBytes(cn);
+            byte[] bytes = JDA.getClassBytes(container, cn);
             final Map<String, byte[]> loadedClasses = JDA.getLoadedBytes();
             MetadataSystem metadataSystem = new MetadataSystem(new ITypeLoader() {
                 private InputTypeLoader backLoader = new InputTypeLoader();