fix: avoid memory leak

as title

Log: as title
Pms: BUG-318013

Author: yixinshark

src/global_util/plugin_manager/modules_loader.cpp

@@ -33,6 +33,12 @@ ModulesLoader::~ModulesLoader()
 {
     quit();
     wait();
+    
+    QMutexLocker locker(&m_mutex);
+    for (auto &loader : m_pluginLoaders) {
+        cleanupPluginLoader(loader);
+    }
+    m_pluginLoaders.clear();
 }
 
 ModulesLoader& ModulesLoader::instance()
@@ -86,13 +92,15 @@ void ModulesLoader::findModule(const QString& path)
         // 版本过低则不加载，可能会导致登录器崩溃
         if (!checkVersion(version, LOWEST_VERSION)) {
             qCWarning(DDE_SHELL) << "The module version is too low, version:" << version << ", lowest version:" << LOWEST_VERSION;
+            loader->deleteLater();
             continue;
         }
 
         // 性能优化，分类加载
         QString pluginType = meta.value("pluginType").toString();
         if (!pluginType.isEmpty()) {
             if ((pluginType == LoginType && !m_loadLoginModule) || (pluginType == TrayType && m_loadLoginModule)) {
+                loader->deleteLater();
                 continue;
             }
         } else {
@@ -103,27 +111,27 @@ void ModulesLoader::findModule(const QString& path)
         auto* moduleInstance = dynamic_cast<dss::module::BaseModuleInterface*>(loader->instance());
         if (!moduleInstance) {
             qCWarning(DDE_SHELL) << "Load plugin failed, error:" << loader->errorString();
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
         qCInfo(DDE_SHELL) << "Current plugin key:" << moduleInstance->key();
         if (blackList.contains(moduleInstance->key())) {
             qCInfo(DDE_SHELL) << "The plugin is in black list, won't be loaded.";
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
         int loadPluginType = moduleInstance->loadPluginType();
         if (loadPluginType != dss::module::BaseModuleInterface::Load) {
             qCInfo(DDE_SHELL) << "The plugin dose not want to be loaded.";
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
         if (PluginManager::instance()->contains(moduleInstance->key())) {
             qCInfo(DDE_SHELL) << "The plugin has been loaded.";
-            loader->unload();
+            cleanupPluginLoader(loader);
             continue;
         }
 
@@ -268,6 +276,7 @@ bool ModulesLoader::isPluginEnabled(const QFileInfo& module)
             auto dbusInterface = new QDBusInterface(service, targetPath, interface, dbusConnection);
             if (!dbusInterface || !dbusInterface->isValid()) {
                 qCWarning(DDE_SHELL) << "Check plugin enabled dbus interface is not valid.";
+                dbusInterface->deleteLater();
                 return false;
             }
             const bool pluginEnabled = dbusInterface->property(property.toStdString().c_str()).toBool();
@@ -346,6 +355,14 @@ void ModulesLoader::unloadPlugin(const QString& path)
     }
 }
 
+void ModulesLoader::cleanupPluginLoader(QPluginLoader* loader)
+{
+    if (loader) {
+        loader->unload();
+        loader->deleteLater();
+    }
+}
+
 // TODO 只重新加载/卸载变更的插件
 void ModulesLoader::onDConfigPropertyChanged(const QString& key, const QVariant& value, QObject* objPtr)
 {
@@ -367,4 +384,4 @@ void ModulesLoader::onDbusPropertiesChanged(const QString& interfaceName, const
             start(QThread::LowestPriority);
         }
     }
-}
+}

src/global_util/plugin_manager/modules_loader.h

@@ -40,6 +40,7 @@ class ModulesLoader : public QThread
     bool isPluginEnabled(const QFileInfo &module);
     bool contains(const QString &pluginFile) const;
     QPair<QString, QPluginLoader*> getPluginLoader(const QString &pluginFile) const;
+    void cleanupPluginLoader(QPluginLoader* loader);
 
     static void onDConfigPropertyChanged(const QString &key, const QVariant &value, QObject *objPtr);