8322057: Memory leaks in creating jfr symbol array

Reviewed-by: mgronlun
openjdk · Dec 14, 2023 · a7dde57 · a7dde57 · openjdk-notifier · Dec 14, 2023
1 parent 692be57
commit a7dde57
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.cpp
@@ -525,6 +525,12 @@ const char* JfrJavaSupport::c_str(jstring string, Thread* thread, bool c_heap /*
   return string != nullptr ? c_str(resolve_non_null(string), thread, c_heap) : nullptr;
 }
 
+void JfrJavaSupport::free_c_str(const char* str, bool c_heap) {
+  if (c_heap) {
+    FREE_C_HEAP_ARRAY(char, str);
+  }
+}
+
 static Symbol** allocate_symbol_array(bool c_heap, int length, Thread* thread) {
   return c_heap ?
            NEW_C_HEAP_ARRAY(Symbol*, length, mtTracing) :
@@ -546,6 +552,7 @@ Symbol** JfrJavaSupport::symbol_array(jobjectArray string_array, JavaThread* thr
     if (object != nullptr) {
       const char* text = c_str(arrayOop->obj_at(i), thread, c_heap);
       symbol = SymbolTable::new_symbol(text);
+      free_c_str(text, c_heap);
     }
     result_array[i] = symbol;
   }

diff --git a/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp b/src/hotspot/share/jfr/jni/jfrJavaSupport.hpp
@@ -86,6 +86,7 @@ class JfrJavaSupport : public AllStatic {
   static Klass* klass(const jobject handle);
   static const char* c_str(jstring string, Thread* thread, bool c_heap = false);
   static const char* c_str(oop string, Thread* thread, bool c_heap = false);
+  static void free_c_str(const char* str, bool c_heap);
   static Symbol** symbol_array(jobjectArray string_array, JavaThread* thread, intptr_t* result_size, bool c_heap = false);
 
   // exceptions