From 9ccc2560c844dcd607ff3d5f08f7daa7df08b623 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 9 Oct 2014 15:17:48 +0200 Subject: QFontDatabase: Fall back to "Any" writing system if none matches The scriptForWritingSystem array has significantly fewer entries than QChar::Script. It can easily happen that we don't find a writing system for a given script. In that case, just assume any writing system can be used. This fixes an out-of-bounds array access resulting from the writing system index being one-past-end if std::find doesn't find a match. Change-Id: Ic277be1dad71af42d479e70e0b4bf29a7dc8d0a7 Reviewed-by: Konstantin Ritt Reviewed-by: Allan Sandfeld Jensen --- src/gui/text/qfontdatabase.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 8fe6aff79f..c00d3d18a6 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1144,7 +1144,10 @@ static int match(int script, const QFontDef &request, load(family_name, script); - const size_t writingSystem = std::find(scriptForWritingSystem, scriptForWritingSystem + QFontDatabase::WritingSystemsCount, script) - scriptForWritingSystem; + size_t writingSystem = std::find(scriptForWritingSystem, scriptForWritingSystem + + QFontDatabase::WritingSystemsCount, script) - scriptForWritingSystem; + if (writingSystem >= QFontDatabase::WritingSystemsCount) + writingSystem = QFontDatabase::Any; QFontDatabasePrivate *db = privateDb(); for (int x = 0; x < db->count; ++x) { -- cgit v1.2.3