From 6f54eda4a42a7c27c8eabbdc1c989de7cf246bdb Mon Sep 17 00:00:00 2001
From: Justin Lu <jlu@openjdk.org>
Date: Fri, 10 Mar 2023 17:40:10 +0000
Subject: [PATCH] 8299088: ClassLoader::defineClass2 throws OOME but JNI
 exception pending thrown by getUTF

Reviewed-by: mchung, naoto
---
 src/java.base/share/native/libjava/ClassLoader.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/java.base/share/native/libjava/ClassLoader.c b/src/java.base/share/native/libjava/ClassLoader.c
index 301f068070b..927432d1509 100644
--- a/src/java.base/share/native/libjava/ClassLoader.c
+++ b/src/java.base/share/native/libjava/ClassLoader.c
@@ -185,7 +185,6 @@ Java_java_lang_ClassLoader_defineClass2(JNIEnv *env,
     if (name != NULL) {
         utfName = getUTF(env, name, buf, sizeof(buf));
         if (utfName == NULL) {
-            JNU_ThrowOutOfMemoryError(env, NULL);
             return result;
         }
         fixClassname(utfName);
@@ -196,7 +195,6 @@ Java_java_lang_ClassLoader_defineClass2(JNIEnv *env,
     if (source != NULL) {
         utfSource = getUTF(env, source, sourceBuf, sizeof(sourceBuf));
         if (utfSource == NULL) {
-            JNU_ThrowOutOfMemoryError(env, NULL);
             goto free_utfName;
         }
     } else {
@@ -301,7 +299,6 @@ Java_java_lang_ClassLoader_findBootstrapClass(JNIEnv *env, jclass dummy,
 
     clname = getUTF(env, classname, buf, sizeof(buf));
     if (clname == NULL) {
-        JNU_ThrowOutOfMemoryError(env, NULL);
         return NULL;
     }
     fixClassname(clname);