--- a/hotspot/src/share/vm/classfile/javaClasses.hpp Thu Oct 08 10:25:45 2015 +0000
+++ b/hotspot/src/share/vm/classfile/javaClasses.hpp Thu Oct 08 12:49:30 2015 -1000
@@ -157,7 +157,12 @@
if (count_offset > 0) {
return java_string->int_field(count_offset);
} else {
- return ((typeArrayOop)java_string->obj_field(value_offset))->length();
+ typeArrayOop value_array = ((typeArrayOop)java_string->obj_field(value_offset));
+ if (value_array == NULL) {
+ return 0;
+ } else {
+ return value_array->length();
+ }
}
}
static int utf8_length(oop java_string);