hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Use QString for SubPluginFeatures' virtuals

Browse Source 
The former virtuals returned `const char*`, which lead to invalid reads when
`LadspaSubPluginFeatures` returned pointers to temporary `QByteArray::data`.
This commit is contained in:
Johannes Lorenz
2019-01-18 23:22:52 +01:00
parent f3b23830fb
commit d5dcebed83
5 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/Plugin.h
View File

@@ -165,9 +165,9 @@ public:
// helper functions to retrieve data that is
// not part of the key, but mapped via desc->subPluginFeatures
const char* additionalFileExtensions() const;
const char* displayName() const;
const char* description() const;
QString additionalFileExtensions() const;
QString displayName() const;
QString description() const;
const PixmapLoader* logo() const;
} ;
@@ -200,19 +200,19 @@ public:
// The defaults are sane, i.e. redirect to sub plugins
// supererior descriptor
virtual const char* additionalFileExtensions(const Key&) const
virtual QString additionalFileExtensions(const Key&) const
{
return nullptr;
}
virtual const char* displayName(const Key& k) const
virtual QString displayName(const Key& k) const
{
return k.isValid()
? k.desc->displayName
: k.name.toUtf8().data();
}
virtual const char* description(const Key& k) const
virtual QString description(const Key& k) const
{
return k.isValid() ? k.desc->description : "";
}

4
plugins/LadspaEffect/LadspaSubPluginFeatures.cpp
View File

@@ -44,11 +44,11 @@ LadspaSubPluginFeatures::LadspaSubPluginFeatures( Plugin::PluginTypes _type ) :
const char *LadspaSubPluginFeatures::displayName(const Plugin::Descriptor::SubPluginFeatures::Key &k) const
QString LadspaSubPluginFeatures::displayName(const Plugin::Descriptor::SubPluginFeatures::Key &k) const
{
const ladspa_key_t & lkey = subPluginKeyToLadspaKey(&k);
Ladspa2LMMS * lm = Engine::getLADSPAManager();
return lm->getName(lkey).toUtf8().data();
return lm->getName(lkey);
}

2
plugins/LadspaEffect/LadspaSubPluginFeatures.h
View File

@@ -37,7 +37,7 @@ class LadspaSubPluginFeatures : public Plugin::Descriptor::SubPluginFeatures
public:
LadspaSubPluginFeatures( Plugin::PluginTypes _type );
const char* displayName(const Key& k) const override;
QString displayName(const Key& k) const override;
void fillDescriptionWidget( QWidget * _parent,
const Key * _key ) const override;

20
src/core/Plugin.cpp
View File

@@ -89,6 +89,14 @@ T use_this_or(T this_param, T or_param)
QString use_this_or(QString this_param, QString or_param)
{
return this_param.isNull() ? or_param : this_param;
}
QString Plugin::displayName() const
{
return Model::displayName().isEmpty() // currently always empty
@@ -113,7 +121,7 @@ const PixmapLoader* Plugin::logo() const
const char *Plugin::Descriptor::SubPluginFeatures::Key::additionalFileExtensions() const
QString Plugin::Descriptor::SubPluginFeatures::Key::additionalFileExtensions() const
{
Q_ASSERT(isValid());
return desc->subPluginFeatures
@@ -126,12 +134,13 @@ const char *Plugin::Descriptor::SubPluginFeatures::Key::additionalFileExtensions
const char* Plugin::Descriptor::SubPluginFeatures::Key::displayName() const
QString Plugin::Descriptor::SubPluginFeatures::Key::displayName() const
{
Q_ASSERT(isValid());
return desc->subPluginFeatures
// get from sub plugin
? use_this_or(desc->subPluginFeatures->displayName(*this), desc->displayName)
? use_this_or(desc->subPluginFeatures->displayName(*this),
QString::fromUtf8(desc->displayName))
// get from plugin
: desc->displayName;
}
@@ -150,11 +159,12 @@ const PixmapLoader* Plugin::Descriptor::SubPluginFeatures::Key::logo() const
const char *Plugin::Descriptor::SubPluginFeatures::Key::description() const
QString Plugin::Descriptor::SubPluginFeatures::Key::description() const
{
Q_ASSERT(isValid());
return desc->subPluginFeatures
? use_this_or(desc->subPluginFeatures->description(*this), desc->description)
? use_this_or(desc->subPluginFeatures->description(*this),
QString::fromUtf8(desc->description))
: desc->description;
}

8
src/core/PluginFactory.cpp
View File

@@ -194,12 +194,12 @@ void PluginFactory::discoverPlugins()
pluginInfos << info;
auto addSupportedFileTypes =
[this](const char* supportedFileTypes,
[this](QString supportedFileTypes,
const PluginInfo& info,
const Plugin::Descriptor::SubPluginFeatures::Key* key = nullptr)
{
if(supportedFileTypes)
for (const QString& ext : QString(supportedFileTypes).split(','))
if(!supportedFileTypes.isNull())
for (const QString& ext : supportedFileTypes.split(','))
{
//qDebug() << "Plugin " << info.name() << "supports" << ext;
PluginInfoAndKey infoAndKey;
@@ -212,7 +212,7 @@ void PluginFactory::discoverPlugins()
};
if (info.descriptor->supportedFileTypes)
addSupportedFileTypes(info.descriptor->supportedFileTypes, info);
addSupportedFileTypes(QString(info.descriptor->supportedFileTypes), info);
if (info.descriptor->subPluginFeatures)
{