AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix memory leak of QLibraryPrivate

Browse Source 
this commit is aimed to fix QTBUG-4341. now QFactoryLoaderPrivate's
destructor will call unload() to QLibaryPrivate object which will destory
the plugin's root instance if its refcount reach zero.

Task-number: QTBUG-4341
Change-Id: I3cd3e071b34271bf5802ab09f6c125beda5e9844
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
jian liang 2012-01-22 22:38:49 +08:00 committed by Qt by Nokia
parent 3722bc5d3c
commit e09025c1b6
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,8 +78,11 @@ public:
QFactoryLoaderPrivate::~QFactoryLoaderPrivate()
{
for (int i = 0; i < libraryList.count(); ++i)
libraryList.at(i)->release();
for (int i = 0; i < libraryList.count(); ++i) {
QLibraryPrivate *library = libraryList.at(i);
library->unload();
library->release();
}
}
QFactoryLoader::QFactoryLoader(const char *iid,
@ -142,7 +145,10 @@ void QFactoryLoader::update()
library->release();
continue;
}
QObject *instance = library->instance();
if (!library->inst)
library->inst = library->instance();
QObject *instance = library->inst.data();
if (!instance) {
library->release();
// ignore plugins that have a valid signature but cannot be loaded.
@ -215,8 +221,11 @@ QObject *QFactoryLoader::instance(const QString &key) const
QString lowered = d->cs ? key : key.toLower();
if (QLibraryPrivate* library = d->keyMap.value(lowered)) {
if (library->instance || library->loadPlugin()) {
if (QObject *obj = library->instance()) {
if (obj && !obj->parent())
if (!library->inst)
library->inst = library->instance();
QObject *obj = library->inst.data();
if (obj) {
if (!obj->parent())
obj->moveToThread(QCoreApplicationPrivate::mainThread());
return obj;
}