archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7183985: (ann) Class.getAnnotation() throws an ArrayStoreException when the annotation class not present

Browse source 
Reviewed-by: darcy, martin, vromero
This commit is contained in:
Liam Miller-Cushon 2018-06-14 17:32:31 -07:00
parent 8e3570cfc2
commit b61c993004
9 changed files with 545 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/java.base/share/classes/sun/reflect/annotation/AnnotationParser.java
View file

@ -715,19 +715,23 @@ public class AnnotationParser {
ConstantPool constPool,
Class<?> container) {
Object[] result = new Class<?>[length];
boolean typeMismatch = false;
int tag = 0;
Object exceptionProxy = null;
for (int i = 0; i < length; i++) {
tag = buf.get();
int tag = buf.get();
if (tag == 'c') {
result[i] = parseClassValue(buf, constPool, container);
Object value = parseClassValue(buf, constPool, container);
if (value instanceof ExceptionProxy) {
if (exceptionProxy == null) exceptionProxy = (ExceptionProxy) value;
} else {
result[i] = value;
}
} else {
skipMemberValue(tag, buf);
typeMismatch = true;
if (exceptionProxy == null) exceptionProxy = exceptionProxy(tag);
}
}
return typeMismatch ? exceptionProxy(tag) : result;
return (exceptionProxy != null) ? exceptionProxy : result;
}
private static Object parseEnumArray(int length, Class<? extends Enum<?>> enumType,
@ -735,19 +739,23 @@ public class AnnotationParser {
ConstantPool constPool,
Class<?> container) {
Object[] result = (Object[]) Array.newInstance(enumType, length);
boolean typeMismatch = false;
int tag = 0;
Object exceptionProxy = null;
for (int i = 0; i < length; i++) {
tag = buf.get();
int tag = buf.get();
if (tag == 'e') {
result[i] = parseEnumValue(enumType, buf, constPool, container);
Object value = parseEnumValue(enumType, buf, constPool, container);
if (value instanceof ExceptionProxy) {
if (exceptionProxy == null) exceptionProxy = (ExceptionProxy) value;
} else {
result[i] = value;
}
} else {
skipMemberValue(tag, buf);
typeMismatch = true;
if (exceptionProxy == null) exceptionProxy = exceptionProxy(tag);
}
}
return typeMismatch ? exceptionProxy(tag) : result;
return (exceptionProxy != null) ? exceptionProxy : result;
}
private static Object parseAnnotationArray(int length,
@ -756,19 +764,23 @@ public class AnnotationParser {
ConstantPool constPool,
Class<?> container) {
Object[] result = (Object[]) Array.newInstance(annotationType, length);
boolean typeMismatch = false;
int tag = 0;
Object exceptionProxy = null;
for (int i = 0; i < length; i++) {
tag = buf.get();
int tag = buf.get();
if (tag == '@') {
result[i] = parseAnnotation(buf, constPool, container, true);
Object value = parseAnnotation(buf, constPool, container, true);
if (value instanceof ExceptionProxy) {
if (exceptionProxy == null) exceptionProxy = (ExceptionProxy) value;
} else {
result[i] = value;
}
} else {
skipMemberValue(tag, buf);
typeMismatch = true;
if (exceptionProxy == null) exceptionProxy = exceptionProxy(tag);
}
}
return typeMismatch ? exceptionProxy(tag) : result;
return (exceptionProxy != null) ? exceptionProxy : result;
}
/**