infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-14 08:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make an alternative fix in compute_enclosing_class

Browse Source
This commit is contained in:
Jan Kratochvil 2025-10-09 14:59:23 +02:00
parent 3360ce37c6
commit 82d539cd75
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hotspot/share/oops/instanceKlass.cpp
View File

@ -3329,6 +3329,18 @@ InstanceKlass* InstanceKlass::compute_enclosing_class(bool* inner_is_member, TRA
// If no inner class attribute found for this class.
if (nullptr == outer_klass) return nullptr;
// Wait until also outer_klass gets fully loaded.
InstanceKlass* pool_holder = outer_klass->constants()->pool_holder();
ClassLoaderData* loader_data = pool_holder->class_loader_data();
if (loader_data == nullptr) {
HandleMark hm(THREAD);
Handle h_init_lock(THREAD, pool_holder->init_lock());
ObjectLocker ol(h_init_lock, THREAD);
loader_data = pool_holder->class_loader_data();
assert(loader_data != nullptr, "class still has not been loaded");
}
// Throws an exception if outer klass has not declared k as an inner klass
// We need evidence that each klass knows about the other, or else
// the system could allow a spoof of an inner class to gain access rights.