diff options
| author | Joni Poikelin <joni.poikelin@qt.io> | 2022-05-05 13:11:53 +0300 |
|---|---|---|
| committer | Joni Poikelin <joni.poikelin@qt.io> | 2022-05-10 06:24:44 +0000 |
| commit | 691541023aa11c085186ef7f691507c158e1df75 (patch) | |
| tree | 5a9368ef3e065b42d653d1ec06887c6c640e40f1 /src/gui/text/unix/qfontconfigdatabase.cpp | |
| parent | d490501641b1f3990382d3ad3523233fdbf3da61 (diff) | |
Prevent crashing when FcFontList fails
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>
Diffstat (limited to 'src/gui/text/unix/qfontconfigdatabase.cpp')
| -rw-r--r-- | src/gui/text/unix/qfontconfigdatabase.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/unix/qfontconfigdatabase.cpp b/src/gui/text/unix/qfontconfigdatabase.cpp index 8d9844929d..c91d6f4bb0 100644 --- a/src/gui/text/unix/qfontconfigdatabase.cpp +++ b/src/gui/text/unix/qfontconfigdatabase.cpp @@ -593,6 +593,8 @@ void QFontconfigDatabase::populateFontDatabase() fonts = FcFontList(nullptr, pattern, os); FcObjectSetDestroy(os); FcPatternDestroy(pattern); + if (!fonts) + return; } for (int i = 0; i < fonts->nfont; i++) |