From 691541023aa11c085186ef7f691507c158e1df75 Mon Sep 17 00:00:00 2001 From: Joni Poikelin Date: Thu, 5 May 2022 13:11:53 +0300 Subject: 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 --- src/gui/text/unix/qfontconfigdatabase.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/gui/text/unix/qfontconfigdatabase.cpp') 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++) -- cgit v1.2.3