8247716: JVM_RegisterWhiteBoxMethods checks wrong classloader

iignatev · iignatev · commit f740cda5261f · 2020-06-17T07:40:09.000-07:00
Reviewed-by: dcubed
diff --git a/src/hotspot/share/prims/whitebox.cpp b/src/hotspot/share/prims/whitebox.cpp
@@ -2555,7 +2555,7 @@ JVM_ENTRY(void, JVM_RegisterWhiteBoxMethods(JNIEnv* env, jclass wbclass))
   {
     if (WhiteBoxAPI) {
       // Make sure that wbclass is loaded by the null classloader
-      InstanceKlass* ik = InstanceKlass::cast(JNIHandles::resolve(wbclass)->klass());
+      InstanceKlass* ik = InstanceKlass::cast(java_lang_Class::as_Klass(JNIHandles::resolve(wbclass)));
       Handle loader(THREAD, ik->class_loader());
       if (loader.is_null()) {
         WhiteBox::register_methods(env, wbclass, thread, methods, sizeof(methods) / sizeof(methods[0]));

Original file line number	Diff line number	Diff line change
`@@ -2555,7 +2555,7 @@ JVM_ENTRY(void, JVM_RegisterWhiteBoxMethods(JNIEnv* env, jclass wbclass))`
`2555`	`2555`	`{`
`2556`	`2556`	`if (WhiteBoxAPI) {`
`2557`	`2557`	`// Make sure that wbclass is loaded by the null classloader`
`2558`		`- InstanceKlass* ik = InstanceKlass::cast(JNIHandles::resolve(wbclass)->klass());`
	`2558`	`+ InstanceKlass* ik = InstanceKlass::cast(java_lang_Class::as_Klass(JNIHandles::resolve(wbclass)));`
`2559`	`2559`	`Handle loader(THREAD, ik->class_loader());`
`2560`	`2560`	`if (loader.is_null()) {`
`2561`	`2561`	`WhiteBox::register_methods(env, wbclass, thread, methods, sizeof(methods) / sizeof(methods[0]));`