[Bf-blender-cvs] [52fb8b1e80e] master: Fix T67117: Font thumbnails crash to desktop
Sebastian Parborg
noreply at git.blender.org
Wed Jul 24 11:27:20 CEST 2019
Commit: 52fb8b1e80ec1e76e0e3b82329042cd37be29d1e
Author: Sebastian Parborg
Date: Wed Jul 24 11:26:21 2019 +0200
Branches: master
https://developer.blender.org/rB52fb8b1e80ec1e76e0e3b82329042cd37be29d1e
Fix T67117: Font thumbnails crash to desktop
We were missing a null pointer check for invalid fonts.
===================================================================
M source/blender/blenfont/intern/blf_glyph.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 049af7678d5..66be94aaa06 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -96,7 +96,7 @@ KerningCacheBLF *blf_kerning_cache_new(FontBLF *font)
.x = 0,
.y = 0,
};
- if (g_prev && FT_Get_Kerning(font->face, g_prev->idx, g->idx, kc->mode, &delta) == 0) {
+ if (g && g_prev && FT_Get_Kerning(font->face, g_prev->idx, g->idx, kc->mode, &delta) == 0) {
kc->table[i][j] = (int)delta.x >> 6;
}
else {
More information about the Bf-blender-cvs
mailing list