8034119: [parfait] JNI exception pending in jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m

Reviewed-by: jgodinez, serb

8034119: [parfait] JNI exception pending in jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m
Reviewed-by: jgodinez, serb
07d1f17d · prr · b7f44fc1 · 07d1f17d
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

src/macosx/native/sun/font/CCharToGlyphMapper.m src/macosx/native/sun/font/CCharToGlyphMapper.m +4 -1

未找到文件。
--- a/src/macosx/native/sun/font/CCharToGlyphMapper.m
+++ b/src/macosx/native/sun/font/CCharToGlyphMapper.m
@@ -101,10 +101,13 @@ JNF_COCOA_ENTER(env);
    jchar *unicodesAsChars =
        (*env)->GetPrimitiveArrayCritical(env, unicodes, NULL);

-    AllocateGlyphBuffer(env, awtFont, count, (UniChar *)unicodesAsChars, glyphs);
+    if (unicodesAsChars != NULL) {
+        AllocateGlyphBuffer(env, awtFont, count,
+                           (UniChar *)unicodesAsChars, glyphs);

    (*env)->ReleasePrimitiveArrayCritical(env, unicodes,
                                          unicodesAsChars, JNI_ABORT);
+    }

 JNF_COCOA_EXIT(env);
 }