fix: descriptor being able to be empty in annotations

Col-E · Aug 27, 2023 · 59289b6 · 59289b6
1 parent 48e4220
commit 59289b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/recaf-core/src/main/java/me/coley/recaf/mapping/RemapperImpl.java b/recaf-core/src/main/java/me/coley/recaf/mapping/RemapperImpl.java
@@ -87,6 +87,7 @@ public String mapMethodDesc(String methodDescriptor) {
 
 	@Override
 	public String mapDesc(String descriptor) {
+		if(descriptor.isEmpty()) return descriptor;
 		if (descriptor.charAt(0) == '(') {
 			return mapMethodDesc(descriptor);
 		}

diff --git a/recaf-core/src/main/java/me/coley/recaf/search/query/ReferenceQuery.java b/recaf-core/src/main/java/me/coley/recaf/search/query/ReferenceQuery.java
@@ -194,6 +194,7 @@ public AnnotationVisitor visitAnnotationDefault() {
 			@Override
 			public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
 				AnnotationVisitor av = super.visitAnnotation(desc, visible);
+				if(desc.isEmpty()) return av;
 				String type = desc.substring(1, desc.length() - 1);
 				whenMatched(type, null, null,
 						builder -> addMethodAnno(builder, methodInfo, type));
@@ -203,6 +204,7 @@ public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
 			@Override
 			public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
 				AnnotationVisitor av = super.visitTypeAnnotation(typeRef, typePath, desc, visible);
+				if(desc.isEmpty()) return av;
 				String type = desc.substring(1, desc.length() - 1);
 				whenMatched(type, null, null,
 						builder -> addMethodAnno(builder, methodInfo, type));
@@ -212,6 +214,7 @@ public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, Str
 			@Override
 			public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
 				AnnotationVisitor av = super.visitParameterAnnotation(parameter, desc, visible);
+				if(desc.isEmpty()) return av;
 				String type = desc.substring(1, desc.length() - 1);
 				whenMatched(type, null, null,
 						builder -> addMethodAnno(builder, methodInfo, type));

diff --git a/recaf-core/src/main/java/me/coley/recaf/search/query/TextQuery.java b/recaf-core/src/main/java/me/coley/recaf/search/query/TextQuery.java
@@ -198,13 +198,15 @@ public AnnotationVisitor visitAnnotationDefault() {
 			@Override
 			public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) {
 				AnnotationVisitor av = super.visitParameterAnnotation(parameter, desc, visible);
+				if(desc.isEmpty()) return av;
 				return new TextAnnotationVisitor(av, builder -> addMethodAnno(builder,
 						methodInfo.getName(), methodInfo.getDescriptor(), desc));
 			}
 
 			@Override
 			public AnnotationVisitor visitInsnAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) {
 				AnnotationVisitor av = super.visitInsnAnnotation(typeRef, typePath, desc, visible);
+				if(desc.isEmpty()) return av;
 				return new TextAnnotationVisitor(av, builder -> addMethodAnno(builder,
 						methodInfo.getName(), methodInfo.getDescriptor(), desc));
 			}
@@ -213,6 +215,7 @@ public AnnotationVisitor visitInsnAnnotation(int typeRef, TypePath typePath, Str
 			public AnnotationVisitor visitTryCatchAnnotation(int typeRef, TypePath typePath, String desc,
 															 boolean visible) {
 				AnnotationVisitor av = super.visitTryCatchAnnotation(typeRef, typePath, desc, visible);
+				if(desc.isEmpty()) return av;
 				return new TextAnnotationVisitor(av, builder -> addMethodAnno(builder,
 						methodInfo.getName(), methodInfo.getDescriptor(), desc));
 			}
@@ -223,6 +226,7 @@ public AnnotationVisitor visitLocalVariableAnnotation(int typeRef, TypePath type
 																  String desc, boolean visible) {
 				AnnotationVisitor av = super.visitLocalVariableAnnotation(typeRef, typePath, start, end,
 						index, desc, visible);
+				if(desc.isEmpty()) return av;
 				return new TextAnnotationVisitor(av, builder -> addMethodAnno(builder,
 						methodInfo.getName(), methodInfo.getDescriptor(), desc));
 			}