# HG changeset patch
# User mbaesken
# Date 1571403361 -7200
# Node ID 4b13a908c2d03101868a3488a4cf6f8d94dac9a5
# Parent  2e0462f4cf4e4332cdfe60ca178db50771284db8
8232381: add result NULL-checking to freetypeScaler.c
Reviewed-by: clanger, prr

diff -r 2e0462f4cf4e -r 4b13a908c2d0 src/java.desktop/share/native/libfontmanager/freetypeScaler.c
--- a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c	Fri Oct 18 14:15:10 2019 +0800
+++ b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c	Fri Oct 18 14:56:01 2019 +0200
@@ -673,10 +673,14 @@
                                  pScalerContext, pScaler, glyphCode);
      info = (GlyphInfo*) jlong_to_ptr(image);
 
-     (*env)->SetFloatField(env, metrics, sunFontIDs.xFID, info->advanceX);
-     (*env)->SetFloatField(env, metrics, sunFontIDs.yFID, info->advanceY);
-
-     free(info);
+     if (info != NULL) {
+         (*env)->SetFloatField(env, metrics, sunFontIDs.xFID, info->advanceX);
+         (*env)->SetFloatField(env, metrics, sunFontIDs.yFID, info->advanceY);
+         free(info);
+     } else {
+         (*env)->SetFloatField(env, metrics, sunFontIDs.xFID, 0.0f);
+         (*env)->SetFloatField(env, metrics, sunFontIDs.yFID, 0.0f);
+     }
 }