diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-21 17:45:55 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-23 17:50:31 +0200 |
| commit | f07c27eec117c664e3c0101c3077524647a32662 (patch) | |
| tree | 3a7cd02bdcce1a24d001731fffc35cfa5de0b115 /src/corelib/plugin | |
| parent | cfaf851e268dac95cb140fbffc1233981ce48d4c (diff) | |
Don't store QLibraryPrivate with empty file names in the global store
They shouldn't exist in the first place. They exist in two cases only:
1) mistake by the user in the QLibrary or QPluginLoader constructors or
setFileName
2) as a kludge for setLoadHints before a file name is set (we need to
store the user's requested hints somewhere)
This is important for the second case, as otherwise all QLibrary and
QPluginLoader objects without a file name would share the setting.
Task-number: QTBUG-39642
Change-Id: Iebff0252fd4d95a1d54caf338d4e2fff4de3b189
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/corelib/plugin')
| -rw-r--r-- | src/corelib/plugin/qlibrary.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index ae53dcdc32..8af38acf51 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -455,7 +455,7 @@ inline QLibraryPrivate *QLibraryStore::findOrCreate(const QString &fileName, con lib = new QLibraryPrivate(fileName, version, loadHints); // track this library - if (Q_LIKELY(data)) + if (Q_LIKELY(data) && !fileName.isEmpty()) data->libraryMap.insert(fileName, lib); lib->libraryRefCount.ref(); @@ -475,7 +475,7 @@ inline void QLibraryStore::releaseLibrary(QLibraryPrivate *lib) // no one else is using Q_ASSERT(lib->libraryUnloadCount.load() == 0); - if (Q_LIKELY(data)) { + if (Q_LIKELY(data) && !lib->fileName.isEmpty()) { QLibraryPrivate *that = data->libraryMap.take(lib->fileName); Q_ASSERT(lib == that); Q_UNUSED(that); |