Merge pull request #11241 from DanHeidinga/djh/unsafejni

Fetch array length before dropping vm access
eclipse-openj9 · Nov 20, 2020 · 749f941 · 749f941
2 parents ac22731 + 7917f50
commit 749f941
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/runtime/jcl/common/sun_misc_Unsafe.cpp b/runtime/jcl/common/sun_misc_Unsafe.cpp
@@ -119,12 +119,12 @@ Java_sun_misc_Unsafe_defineAnonymousClass(JNIEnv *env, jobject receiver, jclass
 		}
 	}
 
-	vmFuncs->internalExitVMToJNI(currentThread);
+	jsize length = (jsize)J9INDEXABLEOBJECT_SIZE(currentThread, J9_JNI_UNWRAP_REFERENCE(bytecodes));
 
-	jsize length = env->GetArrayLength(bytecodes);
+	vmFuncs->internalExitVMToJNI(currentThread);
 
 	/* acquires access internally */
-	jclass anonClass = defineClassCommon(env, hostClassLoaderLocalRef, NULL,bytecodes, 0, length, protectionDomainLocalRef, &defineClassOptions, hostClazz, &cpPatchMap, FALSE);
+	jclass anonClass = defineClassCommon(env, hostClassLoaderLocalRef, NULL, bytecodes, 0, length, protectionDomainLocalRef, &defineClassOptions, hostClazz, &cpPatchMap, FALSE);
 	if (env->ExceptionCheck()) {
 		return NULL;
 	} else if (NULL == anonClass) {