Mercurial > hg > graal-jvmci-8
changeset 23746:0dceb4846c8c
8031427: AllocObject and Unsafe.allocateInstance segfault for primitive types
Summary: The fix just throws an InstantiationException if the Klass is NULL.
Reviewed-by: coleenp, twisti, jrose
Contributed-by: gdub <duboscq@ssw.jku.at>
| author | gdub |
|---|---|
| date | Fri, 26 Aug 2016 13:37:53 -0700 |
| parents | a074ae16281d |
| children | 4da0ab22649c |
| files | src/share/vm/prims/jni.cpp |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp Fri Aug 26 17:49:18 2016 +0200 +++ b/src/share/vm/prims/jni.cpp Fri Aug 26 13:37:53 2016 -0700 @@ -1409,6 +1409,10 @@ static instanceOop alloc_object(jclass clazz, TRAPS) { KlassHandle k(THREAD, java_lang_Class::as_Klass(JNIHandles::resolve_non_null(clazz))); + if (k == NULL) { + ResourceMark rm(THREAD); + THROW_(vmSymbols::java_lang_InstantiationException(), NULL); + } k()->check_valid_for_instantiation(false, CHECK_NULL); InstanceKlass::cast(k())->initialize(CHECK_NULL); instanceOop ih = InstanceKlass::cast(k())->allocate_instance(THREAD);