alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle an invalid metadata in PluginLoader

Browse Source 
REVIEW: 124823
This commit is contained in:
David Edmundson 2015-08-19 16:58:16 +01:00
parent a7b438ece4
commit 7061235418
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plasma/pluginloader.cpp
View File

@ -223,6 +223,7 @@ Applet *PluginLoader::loadApplet(const QString &name, uint appletId, const QVari
p.setFallbackPackage(fp);
if (!fp.isValid()) {
qWarning() << "invalid fallback path in " << p.path();
return 0;
}
}
@ -231,8 +232,13 @@ Applet *PluginLoader::loadApplet(const QString &name, uint appletId, const QVari
// TODO: remove when Plasma 5.4 is released
{
KPluginInfo info = KPluginInfo::fromMetaData(p.metadata());
if (!info.isValid()) {
qWarning() << "invalid plugin in" << p.path();
return 0;
}
KPluginLoader loader(info.libraryPath());
if (!Plasma::isPluginVersionCompatible(loader.pluginVersion())) {
qWarning() << "incompatiable plugin version in" << p.path();
return 0;
}
KPluginFactory *factory = loader.factory();