Commit: dc06bf2cb6b1289cdb90b960b8f125f99e57946b
Author: Campbell Barton
Date: Thu Sep 22 22:07:58 2022 +1000
Branches: master
https://developer.blender.org/rBdc06bf2cb6b1289cdb90b960b8f125f99e57946b
Fix crash loading fonts that fail to be read
Null pointer dereference since [0] when font's can't be read.
[0]: d39abb74a0a99fde2c9d845821d52c198ae4da24
===================================================================
M source/blender/blenfont/intern/blf_font.c
===================================================================
diff --git a/source/blender/blenfont/intern/blf_font.c
b/source/blender/blenfont/intern/blf_font.c
index eaea88be9ae..fcded5a13cd 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -1346,7 +1346,9 @@ bool blf_ensure_face(FontBLF *font)
if (font->mem) {
err = FT_New_Memory_Face(font->ft_lib, font->mem,
(FT_Long)font->mem_size, 0, &font->face);
}
- font->face->generic.data = font;
+ if (!err) {
+ font->face->generic.data = font;
+ }
BLI_mutex_unlock(&ft_lib_mutex);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
