diff options
| author | Joni Poikelin <joni.poikelin@qt.io> | 2022-05-05 13:11:53 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-10 09:32:44 +0000 |
| commit | 26b6bc9abc7e54cb68e7b585886e4f21508b941f (patch) | |
| tree | 275366b919557397cf451ccca426f49d9dfaedbc /src/gui/text | |
| parent | 66802ddd1f393b42e71446bdde5177d4f9f9ab7d (diff) | |
Prevent crashing when FcFontList fails
FcFontList can return null pointer in failure cases which would lead to
null pointer dereference further down.
Change-Id: I6b407cf2f27ead9eb471d3ee7a521468cebf7572
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
(cherry picked from commit 691541023aa11c085186ef7f691507c158e1df75)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/gui/text')
| -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 98faac6cee..371db6fc2e 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++) |