1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent crashing when FcFontList fails

Browse Source 
FcFontList can return null pointer in failure cases which would lead to
null pointer dereference further down.

Pick-to: 5.15 6.2 6.3
Change-Id: I6b407cf2f27ead9eb471d3ee7a521468cebf7572
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
Joni Poikelin 2022-05-05 13:11:53 +03:00
parent d490501641
commit 691541023a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/unix/qfontconfigdatabase.cpp
View File

@ -593,6 +593,8 @@ void QFontconfigDatabase::populateFontDatabase()
fonts = FcFontList(nullptr, pattern, os); fonts = FcFontList(nullptr, pattern, os);
FcObjectSetDestroy(os); FcObjectSetDestroy(os);
FcPatternDestroy(pattern); FcPatternDestroy(pattern);
if (!fonts)
return;
} }
for (int i = 0; i < fonts->nfont; i++) for (int i = 0; i < fonts->nfont; i++)