Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #354 from ThexXTURBOXx/master

Browse source 
Fix JD GUI decompiler
This commit is contained in:
Konloch 2021-09-15 14:56:40 -07:00 committed by GitHub
commit 68e828aacc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/the/bytecode/club/bytecodeviewer/decompilers/jdgui/JDGUIClassFileUtil.java
View file

@ -5,7 +5,6 @@ import java.io.DataInputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.Objects;
import org.jd.core.v1.model.classfile.constant.Constant; import org.jd.core.v1.model.classfile.constant.Constant;
import org.jd.core.v1.model.classfile.constant.ConstantClass; import org.jd.core.v1.model.classfile.constant.ConstantClass;
import org.jd.core.v1.model.classfile.constant.ConstantUtf8; import org.jd.core.v1.model.classfile.constant.ConstantUtf8;
@ -29,8 +28,9 @@ public class JDGUIClassFileUtil
BufferedInputStream bis = new BufferedInputStream(fis); BufferedInputStream bis = new BufferedInputStream(fis);
DataInputStream dis = new DataInputStream(bis)) { DataInputStream dis = new DataInputStream(bis)) {
int magic = dis.readInt(); int magic = dis.readInt();
if (magic != ClassFileReader.JAVA_MAGIC_NUMBER) if (magic != ClassFileReader.JAVA_MAGIC_NUMBER) {
throw new ClassFileFormatException("Invalid Java .class file"); throw new ClassFileFormatException("Invalid Java .class file");
}
/* int minor_version = */ /* int minor_version = */
dis.readUnsignedShort(); dis.readUnsignedShort();
@ -43,16 +43,18 @@ public class JDGUIClassFileUtil
dis.readUnsignedShort(); dis.readUnsignedShort();
int this_class = dis.readUnsignedShort(); int this_class = dis.readUnsignedShort();
if (this_class > Objects.requireNonNull(constants).length) { if (this_class > constants.length) {
throw new ClassFileFormatException("Unknown Java structure"); throw new ClassFileFormatException("Unknown Java structure");
} }
Constant c = constants[this_class]; Constant c = constants[this_class];
if ((c == null) || (c.getTag() != Constant.CONSTANT_Class)) if ((c == null) || (c.getTag() != Constant.CONSTANT_Class)) {
throw new ClassFileFormatException("Invalid constant pool"); throw new ClassFileFormatException("Invalid constant pool");
}
c = constants[((ConstantClass) c).getNameIndex()]; c = constants[((ConstantClass) c).getNameIndex()];
if ((c == null) || (c.getTag() != Constant.CONSTANT_Utf8)) if ((c == null) || (c.getTag() != Constant.CONSTANT_Utf8)) {
throw new ClassFileFormatException("Invalid constant pool"); throw new ClassFileFormatException("Invalid constant pool");
}
String internalClassName = ((ConstantUtf8) c).getValue(); String internalClassName = ((ConstantUtf8) c).getValue();
String pathSuffix = internalClassName.replace( String pathSuffix = internalClassName.replace(
@ -61,8 +63,9 @@ public class JDGUIClassFileUtil
int index = pathToClass.indexOf(pathSuffix); int index = pathToClass.indexOf(pathSuffix);
if (index < 0) if (index < 0) {
throw new ClassFileFormatException("Invalid internal class name"); throw new ClassFileFormatException("Invalid internal class name");
}
directoryPath = pathToClass.substring(0, index); directoryPath = pathToClass.substring(0, index);
} catch (IOException e) { } catch (IOException e) {
@ -87,9 +90,6 @@ public class JDGUIClassFileUtil
private static Constant[] DeserializeConstants(DataInputStream dis) private static Constant[] DeserializeConstants(DataInputStream dis)
throws IOException { throws IOException {
int count = dis.readUnsignedShort(); int count = dis.readUnsignedShort();
if (count == 0)
return null;
Constant[] constants = new Constant[count]; Constant[] constants = new Constant[count];
for (int i = 1; i < count; i++) { for (int i = 1; i < count; i++) {
@ -112,12 +112,15 @@ public class JDGUIClassFileUtil
case Constant.CONSTANT_FieldRef: case Constant.CONSTANT_FieldRef:
case Constant.CONSTANT_MethodRef: case Constant.CONSTANT_MethodRef:
case Constant.CONSTANT_InterfaceMethodRef: case Constant.CONSTANT_InterfaceMethodRef:
case Constant.CONSTANT_InvokeDynamic:
case Constant.CONSTANT_NameAndType: case Constant.CONSTANT_NameAndType:
case Constant.CONSTANT_Integer: case Constant.CONSTANT_Integer:
case Constant.CONSTANT_Float: case Constant.CONSTANT_Float:
dis.read(); dis.read();
case Constant.CONSTANT_MethodHandle:
dis.read(); dis.read();
case Constant.CONSTANT_String: case Constant.CONSTANT_String:
case Constant.CONSTANT_MethodType:
dis.read(); dis.read();
dis.read(); dis.read();
break; break;