diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-27 11:22:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 13:33:14 +0200 |
| commit | 23c9d4c98f3c6729b56700edc1d7144b444b16db (patch) | |
| tree | 27b20ccbf3c101dbc7bcb1e509882b6c7fc75962 /src/corelib/plugin/qlibrary.cpp | |
| parent | f69a5857d115786f44d053e68c36f74526020e82 (diff) | |
| parent | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (diff) | |
Merge branch '5.11' into dev
Conflicts:
qmake/library/qmakebuiltins.cpp
src/plugins/platforms/windows/qwindowstabletsupport.h
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
Diffstat (limited to 'src/corelib/plugin/qlibrary.cpp')
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 4b55ead668..869ef6181f 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -317,7 +317,7 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib) if (pos >= 0) { if (hasMetaData) { const char *data = filedata + pos; - QJsonDocument doc = qJsonFromRawLibraryMetaData(data); + QJsonDocument doc = qJsonFromRawLibraryMetaData(data, qsizetype(fdlen)); lib->metaData = doc.object(); if (qt_debug_component()) qWarning("Found metadata in lib %s, metadata=\n%s\n", @@ -691,7 +691,8 @@ static bool qt_get_metadata(QtPluginQueryVerificationDataFunction pfn, QLibraryP if (!szData) return false; - QJsonDocument doc = qJsonFromRawLibraryMetaData(szData); + // the data is already loaded, so the size doesn't matter + QJsonDocument doc = qJsonFromRawLibraryMetaData(szData, INT_MAX); if (doc.isNull()) return false; priv->metaData = doc.object(); |