commit 2beb211aef34d484d763cddfb4445e478aff2ce4
author Phil Race <prr@openjdk.org> Tue Mar 18 11:31:11 2014 -0700
committer Phil Race <prr@openjdk.org> Tue Mar 18 11:31:11 2014 -0700
tree aa30499dbb8611b7dab7c3612e2e5f6f04fc1dd7
parent 21e9bfc83ef5e3f8fcbc77efa3578daec4d408c4

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

Reviewed-by: serb, jgodinez

jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m

diff --git a/jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m b/jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m
index cf08137..d2e12cf 100644
--- a/jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m
+++ b/jdk/src/macosx/native/sun/font/CCharToGlyphMapper.m
@@ -101,10 +101,13 @@
     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);
+        (*env)->ReleasePrimitiveArrayCritical(env, unicodes,
+                                              unicodesAsChars, JNI_ABORT);
+    }
 
 JNF_COCOA_EXIT(env);
 }