Skip to content

Commit 2652fb4

Browse files
committed
Fix bug 73507
1 parent a8d8f44 commit 2652fb4

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

DesktopEditor/fontengine/TextShaper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ namespace NSShaper
451451
CheckUnicodeFaceName(face, family_name, family_name_len);
452452

453453
unsigned int nLen1 = (unsigned int)family_name_len;
454-
unsigned int nLen2 = (unsigned int)strlen(face->style_name);
454+
unsigned int nLen2 = (unsigned int)((face->style_name != NULL) ? strlen(face->style_name) : 0);
455455

456456
unsigned int nLen = 28 + nLen1 + 1 + nLen2 + 1 + 1 + (int)face->num_fixed_sizes;
457457

DesktopEditor/fontengine/TextShaper_p.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,14 @@ void CheckUnicodeFaceName(FT_Face pFace, int*& UName, unsigned int& ULen)
9494
bool isBadASCII = false;
9595

9696
unsigned int face_name_len = 0;
97-
while ('\0' != face_name[face_name_len])
97+
if (NULL != face_name)
9898
{
99-
if ('?' == face_name[face_name_len])
100-
isBadASCII = true;
101-
++face_name_len;
99+
while ('\0' != face_name[face_name_len])
100+
{
101+
if ('?' == face_name[face_name_len])
102+
isBadASCII = true;
103+
++face_name_len;
104+
}
102105
}
103106

104107
if (face_name_len > 6 &&

0 commit comments

Comments
 (0)