1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Fix potential crash in font database when family name is empty.

Browse Source 
Task-number: QTBUG-36651

Change-Id: Icd3edc7dbed3e692b32374b0ab6251e7f939589d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Friedemann Kleint 2014-02-10 15:24:55 +01:00 committed by The Qt Project
parent ae4243df1e
commit db98d65415
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
View File

@ -841,7 +841,7 @@ static bool addFontToDatabase(const QString &familyName, uchar charSet,
int type) int type)
{ {
// the "@family" fonts are just the same as "family". Ignore them. // the "@family" fonts are just the same as "family". Ignore them.
if (familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QStringLiteral("WST_"))) if (familyName.isEmpty() || familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QStringLiteral("WST_")))
return false; return false;
static const int SMOOTH_SCALABLE = 0xffff; static const int SMOOTH_SCALABLE = 0xffff;

2
src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
View File

@ -130,7 +130,7 @@ static bool addFontToDatabase(const QString &familyName, uchar charSet,
typedef QPair<QString, QStringList> FontKey; typedef QPair<QString, QStringList> FontKey;
// the "@family" fonts are just the same as "family". Ignore them. // the "@family" fonts are just the same as "family". Ignore them.
if (familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QStringLiteral("WST_"))) if (familyName.isEmpty() || familyName.at(0) == QLatin1Char('@') || familyName.startsWith(QStringLiteral("WST_")))
return false; return false;
const int separatorPos = familyName.indexOf(QStringLiteral("::")); const int separatorPos = familyName.indexOf(QStringLiteral("::"));