8365526: Crash with null Symbol passed to SystemDictionary::resolve_or_null

coleenp · coleenp · commit b98114f4a20b · 2025-12-01T13:28:21.000Z
Reviewed-by: dholmes, never, jsjolen
diff --git a/src/hotspot/share/classfile/resolutionErrors.cpp b/src/hotspot/share/classfile/resolutionErrors.cpp
@@ -73,7 +73,7 @@ void ResolutionErrorTable::add_entry(const constantPoolHandle& pool, int cp_inde
 
   ResolutionErrorKey key(pool(), cp_index);
   ResolutionErrorEntry *entry = new ResolutionErrorEntry(error, message, cause, cause_msg);
-  _resolution_error_table->put(key, entry);
+  _resolution_error_table->put_when_absent(key, entry);
 }
 
 // create new nest host error entry
@@ -85,7 +85,7 @@ void ResolutionErrorTable::add_entry(const constantPoolHandle& pool, int cp_inde
 
   ResolutionErrorKey key(pool(), cp_index);
   ResolutionErrorEntry *entry = new ResolutionErrorEntry(message);
-  _resolution_error_table->put(key, entry);
+  _resolution_error_table->put_when_absent(key, entry);
 }
 
 // find entry in the table
@@ -126,6 +126,15 @@ ResolutionErrorEntry::~ResolutionErrorEntry() {
   }
 }
 
+void ResolutionErrorEntry::set_nest_host_error(const char* message) {
+  // If a message is already set, free it.
+  if (nest_host_error() != nullptr) {
+    FREE_C_HEAP_ARRAY(char, _nest_host_error);
+  }
+  _nest_host_error = message;
+}
+
+
 class ResolutionErrorDeleteIterate : StackObj {
   ConstantPool* p;
 
diff --git a/src/hotspot/share/classfile/resolutionErrors.hpp b/src/hotspot/share/classfile/resolutionErrors.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -91,10 +91,7 @@ class ResolutionErrorEntry : public CHeapObj<mtClass> {
   ~ResolutionErrorEntry();
 
   // The incoming nest host error message is already in the C-Heap.
-  void set_nest_host_error(const char* message) {
-    _nest_host_error = message;
-  }
-
+  void set_nest_host_error(const char* message);
 
   Symbol*            error() const              { return _error; }
   const char*        message() const            { return _message; }
diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
@@ -1864,14 +1864,19 @@ void SystemDictionary::add_nest_host_error(const constantPoolHandle& pool,
   {
     MutexLocker ml(Thread::current(), SystemDictionary_lock);
     ResolutionErrorEntry* entry = ResolutionErrorTable::find_entry(pool, which);
-    if (entry != nullptr && entry->nest_host_error() == nullptr) {
+    if (entry == nullptr) {
+      // Only add a new entry to the resolution error table if one hasn't been found for this
+      // constant pool index. In this case resolution succeeded but there's an error in this nest host
+      // that we use the table to record.
+      assert(pool->resolved_klass_at(which) != nullptr, "klass should be resolved if there is no entry");
+      ResolutionErrorTable::add_entry(pool, which, message);
+    } else {
       // An existing entry means we had a true resolution failure (LinkageError) with our nest host, but we
       // still want to add the error message for the higher-level access checks to report. We should
       // only reach here under the same error condition, so we can ignore the potential race with setting
-      // the message. If we see it is already set then we can ignore it.
+      // the message, and set it again.
+      assert(entry->nest_host_error() == nullptr || strcmp(entry->nest_host_error(), message) == 0, "should be the same message");
       entry->set_nest_host_error(message);
-    } else {
-      ResolutionErrorTable::add_entry(pool, which, message);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1864,14 +1864,19 @@ void SystemDictionary::add_nest_host_error(const constantPoolHandle& pool,`
`1864`	`1864`	`{`
`1865`	`1865`	`MutexLocker ml(Thread::current(), SystemDictionary_lock);`
`1866`	`1866`	`ResolutionErrorEntry* entry = ResolutionErrorTable::find_entry(pool, which);`
`1867`		`- if (entry != nullptr && entry->nest_host_error() == nullptr) {`
	`1867`	`+ if (entry == nullptr) {`
	`1868`	`+ // Only add a new entry to the resolution error table if one hasn't been found for this`
	`1869`	`+ // constant pool index. In this case resolution succeeded but there's an error in this nest host`
	`1870`	`+ // that we use the table to record.`
	`1871`	`+ assert(pool->resolved_klass_at(which) != nullptr, "klass should be resolved if there is no entry");`
	`1872`	`+ ResolutionErrorTable::add_entry(pool, which, message);`
	`1873`	`+ } else {`
`1868`	`1874`	`// An existing entry means we had a true resolution failure (LinkageError) with our nest host, but we`
`1869`	`1875`	`// still want to add the error message for the higher-level access checks to report. We should`
`1870`	`1876`	`// only reach here under the same error condition, so we can ignore the potential race with setting`
`1871`		`- // the message. If we see it is already set then we can ignore it.`
	`1877`	`+ // the message, and set it again.`
	`1878`	`+ assert(entry->nest_host_error() == nullptr \|\| strcmp(entry->nest_host_error(), message) == 0, "should be the same message");`
`1872`	`1879`	`entry->set_nest_host_error(message);`
`1873`		`- } else {`
`1874`		`- ResolutionErrorTable::add_entry(pool, which, message);`
`1875`	`1880`	`}`
`1876`	`1881`	`}`
`1877`	`1882`	`}`