From 9e51974d9bace46c40ebe585102d3102eedc8a35 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@qt.io>
Date: Thu, 11 Jun 2020 19:35:26 +0200
Subject: QFontDatabase: Guard against Null-dereference READ

Fixes: oss-fuzz-23112
Pick-to: 5.15
Change-Id: I06818d8642067cd510a513838e7851eb8b322aef
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/gui/text/qfontdatabase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/gui/text/qfontdatabase.cpp')

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 993c37a92f..b5a9c5bb45 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -2321,7 +2321,7 @@ bool QFontDatabase::removeAllApplicationFonts()
     QMutexLocker locker(fontDatabaseMutex());
 
     QFontDatabasePrivate *db = privateDb();
-    if (db->applicationFonts.isEmpty())
+    if (!db || db->applicationFonts.isEmpty())
         return false;
 
     db->applicationFonts.clear();
-- 
cgit v1.2.3