blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

Fix T99872: Crash Loading Embedded Fonts - Master 

Commit rBc0845abd897f to 3.4 (master) uses font's filepath without
checking if it exists, therefore crashing on embedded fonts since
they do not have a filepath (loaded from memory).

See D15703 for more details

Differential Revision: https://developer.blender.org/D15703

Reviewed by Brecht Van Lommel
This commit is contained in:
Harley Acheson 2022-08-16 12:43:10 -07:00
parent ccf31810d6
commit 09640ab291
Notes: blender-bot 2023-02-14 02:43:21 +01:00 
Referenced by issue #99872, Regression: Crashes when using packed text font in VSE
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/blenfont/intern/blf_font.c
View File

@ -1384,22 +1384,27 @@ static FontBLF *blf_font_new_ex(const char *name,
BLI_mutex_init(&font->glyph_cache_mutex);
/* If we have static details about this font we don't need to load the Face. */
const eFaceDetails *static_details = NULL;
char filename[256];
for (int i = 0; i < (int)ARRAY_SIZE(static_face_details); i++) {
BLI_split_file_part(font->filepath, filename, sizeof(filename));
if (STREQ(static_face_details[i].name, filename)) {
static_details = &static_face_details[i];
font->UnicodeRanges[0] = static_details->coverage1;
font->UnicodeRanges[1] = static_details->coverage2;
font->UnicodeRanges[2] = static_details->coverage3;
font->UnicodeRanges[3] = static_details->coverage4;
break;
/* If we have static details about this font file, we don't have to load the Face yet. */
bool face_needed = true;
if (font->filepath) {
const eFaceDetails *static_details = NULL;
char filename[256];
for (int i = 0; i < (int)ARRAY_SIZE(static_face_details); i++) {
BLI_split_file_part(font->filepath, filename, sizeof(filename));
if (STREQ(static_face_details[i].name, filename)) {
static_details = &static_face_details[i];
font->UnicodeRanges[0] = static_details->coverage1;
font->UnicodeRanges[1] = static_details->coverage2;
font->UnicodeRanges[2] = static_details->coverage3;
font->UnicodeRanges[3] = static_details->coverage4;
face_needed = false;
break;
}
}
}
if (!static_details) {
if (face_needed) {
if (!blf_ensure_face(font)) {
blf_font_free(font);
return NULL;