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

QPlugin: pass the direct header to qJsonFromRawLibraryMetaData()

Browse Source 
This is done in preparation for storing the metadata without the magic
string in static plugins and in ELF notes.

Change-Id: I3eb1bd30e0124f89a052fffd16a820454dd56d3e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Thiago Macieira 2021-09-25 10:19:06 -07:00
parent b07345504c
commit 2549a88ba2
5 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/plugin/qelfparser_p.cpp
View File

@ -210,6 +210,13 @@ QLibraryScanResult QElfParser::parse(const char *dataStart, ulong fdlen, QString
.arg(*errMsg, QLibrary::tr("missing section data. This is not a library.")); .arg(*errMsg, QLibrary::tr("missing section data. This is not a library."));
return {}; return {};
} }
if (sh.size < sizeof(QPluginMetaData::MagicHeader)) {
*errMsg = QLibrary::tr("'%1' is an invalid ELF object (%2)")
.arg(*errMsg, QLibrary::tr("section .qtmetadata is too small"));
return {};
}
sh.offset += sizeof(QPluginMetaData::MagicString);
sh.size -= sizeof(QPluginMetaData::MagicString);
return { qsizetype(sh.offset), qsizetype(sh.size) }; return { qsizetype(sh.offset), qsizetype(sh.size) };
} }
s += e_shentsize; s += e_shentsize;

4
src/corelib/plugin/qfactoryloader.cpp
View File

@ -66,10 +66,6 @@ QT_BEGIN_NAMESPACE
QJsonDocument qJsonFromRawLibraryMetaData(const char *raw, qsizetype size, QString *errMsg) QJsonDocument qJsonFromRawLibraryMetaData(const char *raw, qsizetype size, QString *errMsg)
{ {
Q_ASSERT(size >= qsizetype(sizeof(QPluginMetaData::MagicString)));
raw += sizeof(QPluginMetaData::MagicString);
size -= sizeof(QPluginMetaData::MagicString);
// extract the keys not stored in CBOR // extract the keys not stored in CBOR
QPluginMetaData::Header header; QPluginMetaData::Header header;
Q_ASSERT(size >= qsizetype(sizeof(header))); Q_ASSERT(size >= qsizetype(sizeof(header)));

9
src/corelib/plugin/qlibrary.cpp
View File

@ -205,6 +205,7 @@ static QLibraryScanResult qt_find_pattern(const char *s, qsizetype s_len, QStrin
*errMsg = QLibrary::tr("'%1' is not a Qt plugin").arg(*errMsg); *errMsg = QLibrary::tr("'%1' is not a Qt plugin").arg(*errMsg);
return QLibraryScanResult{}; return QLibraryScanResult{};
} }
i += sizeof(QPluginMetaData::MagicString);
return { i, s_len - i }; return { i, s_len - i };
} }
@ -686,7 +687,13 @@ static bool qt_get_metadata(QLibraryPrivate *priv, QString *errMsg)
return error(QLibrary::tr("entrypoint 'qt_plugin_query_metadata' not found")); return error(QLibrary::tr("entrypoint 'qt_plugin_query_metadata' not found"));
auto metaData = reinterpret_cast<QPluginMetaData (*)()>(pfn)(); auto metaData = reinterpret_cast<QPluginMetaData (*)()>(pfn)();
QJsonDocument doc = qJsonFromRawLibraryMetaData(reinterpret_cast<const char *>(metaData.data), metaData.size, errMsg); auto data = reinterpret_cast<const char *>(metaData.data);
if (metaData.size < sizeof(QPluginMetaData::MagicHeader))
return error(QLibrary::tr("metadata too small"));
data += sizeof(QPluginMetaData::MagicString);
metaData.size -= sizeof(QPluginMetaData::MagicString);
QJsonDocument doc = qJsonFromRawLibraryMetaData(data, metaData.size, errMsg);
if (doc.isNull()) if (doc.isNull())
return false; // error message already set return false; // error message already set

6
src/corelib/plugin/qmachparser.cpp
View File

@ -194,8 +194,12 @@ QLibraryScanResult QMachOParser::parse(const char *m_s, ulong fdlen, QString *e
|| Q_UNLIKELY(fdlen < sect[j].offset + sect[j].size)) || Q_UNLIKELY(fdlen < sect[j].offset + sect[j].size))
return notfound(QString(), errorString); return notfound(QString(), errorString);
if (sect[j].size < sizeof(QPluginMetaData::MagicHeader))
return notfound(QLibrary::tr("section .qtmetadata is too small"), errorString);
qsizetype pos = reinterpret_cast<const char *>(header) - m_s + sect[j].offset; qsizetype pos = reinterpret_cast<const char *>(header) - m_s + sect[j].offset;
return { pos, qsizetype(sect[j].size) }; pos += sizeof(QPluginMetaData::MagicString);
return { pos, qsizetype(sect[j].size - sizeof(QPluginMetaData::MagicString)) };
} }
} }

4
src/corelib/plugin/qpluginloader.cpp
View File

@ -477,10 +477,12 @@ QList<QStaticPlugin> QPluginLoader::staticPlugins()
*/ */
QJsonObject QStaticPlugin::metaData() const QJsonObject QStaticPlugin::metaData() const
{ {
Q_ASSERT(rawMetaDataSize >= qsizetype(sizeof(QPluginMetaData::MagicHeader)));
auto ptr = static_cast<const char *>(rawMetaData); auto ptr = static_cast<const char *>(rawMetaData);
ptr += sizeof(QPluginMetaData::MagicString);
QString errMsg; QString errMsg;
QJsonDocument doc = qJsonFromRawLibraryMetaData(ptr, rawMetaDataSize, &errMsg); QJsonDocument doc = qJsonFromRawLibraryMetaData(ptr, rawMetaDataSize - sizeof(QPluginMetaData::MagicString), &errMsg);
Q_ASSERT(doc.isObject()); Q_ASSERT(doc.isObject());
Q_ASSERT(errMsg.isEmpty()); Q_ASSERT(errMsg.isEmpty());
return doc.object(); return doc.object();