--- old/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m	2015-04-30 15:45:31.000000000 +0300
+++ new/src/java.desktop/macosx/native/libawt_lwawt/font/AWTStrike.m	2015-04-30 15:45:31.000000000 +0300
@@ -311,21 +311,26 @@
 
     jlong *glyphInfos =
         (*env)->GetPrimitiveArrayCritical(env, glyphInfoLongArray, NULL);
-    if (glyphInfos != NULL) {
-        jint *rawGlyphCodes =
-            (*env)->GetPrimitiveArrayCritical(env, glyphCodes, NULL);
 
-        if (rawGlyphCodes != NULL) {
+    jint *rawGlyphCodes =
+            (*env)->GetPrimitiveArrayCritical(env, glyphCodes, NULL);
+    @try {
+        if (rawGlyphCodes != NULL && glyphInfos != NULL) {
             CGGlyphImages_GetGlyphImagePtrs(glyphInfos, awtStrike,
-                                            rawGlyphCodes, len);
-
+                    rawGlyphCodes, len);
+        }
+    }
+    @finally {
+        if (rawGlyphCodes != NULL) {
             (*env)->ReleasePrimitiveArrayCritical(env, glyphCodes,
-                                              rawGlyphCodes, JNI_ABORT);
+                                                  rawGlyphCodes, JNI_ABORT);
+        }
+        if (glyphInfos != NULL) {
+            // Do not use JNI_COMMIT, as that will not free the buffer copy
+            // when +ProtectJavaHeap is on.
+            (*env)->ReleasePrimitiveArrayCritical(env, glyphInfoLongArray,
+                                                  glyphInfos, 0);
         }
-        // Do not use JNI_COMMIT, as that will not free the buffer copy
-        // when +ProtectJavaHeap is on.
-        (*env)->ReleasePrimitiveArrayCritical(env, glyphInfoLongArray,
-                                              glyphInfos, 0);
     }
 
 JNF_COCOA_EXIT(env);