Commit fef37edcbfd5d13ffa1c5ec86c4e2377a23ffd40 - jd-gui

Prevent NPE caused by JD-Core errors emmanue1 4 years ago

2 changed file(s) with 22 addition(s) and 6 deletion(s). Raw diff Collapse all Expand all

-1

services/src/main/java/org/jd/gui/util/decompiler/StringBuilderPrinter.java less more

32	32	public void append(String s) { stringBuffer.append(s); }
33	33
34	34	protected void printEscape(String s) {
35		if (unicodeEscape) {
	35	if (unicodeEscape && (s != null)) {
36	36	int length = s.length();
37	37
38	38	for (int i=0; i<length; i++) {

+21

-5

services/src/main/java/org/jd/gui/view/component/ClassFilePage.java less more

154	154	}
155	155
156	156	// --- Add strings --- //
157		@Override public void printStringConstant(String constant, String ownerInternalName) {
	157	@Override
	158	public void printStringConstant(String constant, String ownerInternalName) {
	159	if (constant == null) constant = "null";
	160	if (ownerInternalName == null) ownerInternalName = "null";
	161
158	162	strings.add(new TypePage.StringData(stringBuffer.length(), constant.length(), constant, ownerInternalName));
159	163	super.printStringConstant(constant, ownerInternalName);
160	164	}
161	165
162		@Override public void printDeclaration(int flags, String internalTypeName, String name, String descriptor) {
	166	@Override
	167	public void printDeclaration(int flags, String internalTypeName, String name, String descriptor) {
	168	if (internalTypeName == null) internalTypeName = "null";
	169	if (name == null) name = "null";
	170	if (descriptor == null) descriptor = "null";
	171
163	172	switch (flags) {
164	173	case TYPE_FLAG:
165	174	TypePage.DeclarationData data = new TypePage.DeclarationData(stringBuffer.length(), name.length(), internalTypeName, null, null);

176	185	super.printDeclaration(flags, internalTypeName, name, descriptor);
177	186	}
178	187
179		@Override public void printReference(int flags, String internalTypeName, String name, String descriptor, String ownerInternalName) {
	188	@Override
	189	public void printReference(int flags, String internalTypeName, String name, String descriptor, String ownerInternalName) {
	190	if (internalTypeName == null) internalTypeName = "null";
	191	if (name == null) name = "null";
	192	if (descriptor == null) descriptor = "null";
	193
180	194	switch (flags) {
181	195	case TYPE_FLAG:
182	196	addHyperlink(new TypePage.HyperlinkReferenceData(stringBuffer.length(), name.length(), newReferenceData(internalTypeName, null, null, ownerInternalName)));

191	205	super.printReference(flags, internalTypeName, name, descriptor, ownerInternalName);
192	206	}
193	207
194		@Override public void startLine(int lineNumber) {
	208	@Override
	209	public void startLine(int lineNumber) {
195	210	super.startLine(lineNumber);
196	211	setLineNumber(textAreaLineNumber, lineNumber);
197	212	}
198		@Override public void endLine() {
	213	@Override
	214	public void endLine() {
199	215	super.endLine();
200	216	textAreaLineNumber++;
201	217	}