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

Guard against empty keys in QPlatformInputContextFactory::create().

Browse Source 
The code relied on QStringList::split() returning a list
consisting of one empty string when passing an enpty string.
Add a check to prevent the plugin loader from trying to load
in this case.

Change-Id: Iadb418d32fdea1d472d6c00726ad039b4afbf409
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2015-09-24 08:42:06 +02:00
parent e87df57abf
commit bf2c9fd2fd
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/kernel/qplatforminputcontextfactory.cpp
View File

@ -65,15 +65,17 @@ QString QPlatformInputContextFactory::requested()
QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key) QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key)
{ {
#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
QStringList paramList = key.split(QLatin1Char(':')); if (!key.isEmpty()) {
const QString platform = paramList.takeFirst().toLower(); QStringList paramList = key.split(QLatin1Char(':'));
const QString platform = paramList.takeFirst().toLower();
QPlatformInputContext *ic = qLoadPlugin1<QPlatformInputContext, QPlatformInputContextPlugin> QPlatformInputContext *ic = qLoadPlugin1<QPlatformInputContext, QPlatformInputContextPlugin>
(loader(), platform, paramList); (loader(), platform, paramList);
if (ic && ic->isValid()) if (ic && ic->isValid())
return ic; return ic;
delete ic; delete ic;
}
#endif #endif
return 0; return 0;
} }