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

8261533: Java_sun_font_CFont_getCascadeList leaks memory according to Xcode

Browse Source 
Reviewed-by: serb
This commit is contained in:
Phil Race 2021-02-12 18:42:07 +00:00
parent 06170b7cbf
commit f0d9829b68
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m
View File

@ -544,6 +544,7 @@ JNIEXPORT void JNICALL
Java_sun_font_CFont_getCascadeList
(JNIEnv *env, jclass cls, jlong awtFontPtr, jobject arrayListOfString)
{
JNI_COCOA_ENTER(env);
jclass alc = (*env)->FindClass(env, "java/util/ArrayList");
if (alc == NULL) return;
jmethodID addMID = (*env)->GetMethodID(env, alc, "add", "(Ljava/lang/Object;)Z");
@ -553,13 +554,15 @@ Java_sun_font_CFont_getCascadeList
AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
NSFont* nsFont = awtFont->fFont;
CTFontRef font = (CTFontRef)nsFont;
CFStringRef base = CTFontCopyFullName(font);
CFArrayRef codes = CFLocaleCopyISOLanguageCodes();
#ifdef DEBUG
CFStringRef base = CTFontCopyFullName(font);
NSLog(@"BaseFont is : %@", (NSString*)base);
CFRelease(base);
#endif
CFArrayRef fds = CTFontCopyDefaultCascadeListForLanguages(font, codes);
CFRelease(codes);
CFIndex cnt = CFArrayGetCount(fds);
for (i=0; i<cnt; i++) {
CTFontDescriptorRef ref = CFArrayGetValueAtIndex(fds, i);
@ -569,10 +572,14 @@ Java_sun_font_CFont_getCascadeList
NSLog(@"Font is : %@", (NSString*)fontname);
#endif
jstring jFontName = (jstring)NSStringToJavaString(env, fontname);
CFRelease(fontname);
(*env)->CallBooleanMethod(env, arrayListOfString, addMID, jFontName);
if ((*env)->ExceptionOccurred(env)) {
CFRelease(fds);
return;
}
(*env)->DeleteLocalRef(env, jFontName);
}
CFRelease(fds);
JNI_COCOA_EXIT(env);
}