fix: [io]Memory leak due to failed asynchronous query for file inform…

…ation Memory leak due to failed asynchronous query for file information Log: Memory leak due to failed asynchronous query for file information
liyigang1 · Aug 31, 2023 · 2b85260 · 2b85260
1 parent d1a2550
commit 2b85260
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/src/dfm-base/utils/fileinfohelper.cpp b/src/dfm-base/utils/fileinfohelper.cpp
@@ -93,19 +93,6 @@ void FileInfoHelper::cacheFileInfoByThread(const QSharedPointer<FileInfo> dfileI
     });
 }
 
-void FileInfoHelper::fileRefreshAsyncCallBack(bool success, void *userData)
-{
-    Q_UNUSED(success);
-    if (!userData)
-        return;
-    auto data = static_cast<FileRefreshCallBackData *>(userData);
-    if (!data->info)
-        return;
-
-    FileInfoHelper::instance().cacheFileInfoByThread(data->info);
-    delete data;
-}
-
 FileInfoHelper::~FileInfoHelper()
 {
     aboutToQuit();
@@ -140,8 +127,13 @@ void FileInfoHelper::handleFileRefresh(QSharedPointer<FileInfo> dfileInfo)
     if (!asyncInfo)
         return;
 
-    FileRefreshCallBackData *data = new FileRefreshCallBackData;
-    data->info = asyncInfo;
-    if (!asyncInfo->asyncQueryDfmFileInfo(0, &FileInfoHelper::fileRefreshAsyncCallBack, data))
-        delete data;
+    auto callback = [asyncInfo](bool success, void *data){
+        Q_UNUSED(data);
+        if (!success) {
+            qWarning() << "Failed to query file information asynchronously! url = " << asyncInfo->fileUrl();
+            return ;
+        }
+        FileInfoHelper::instance().cacheFileInfoByThread(asyncInfo);
+    };
+    asyncInfo->asyncQueryDfmFileInfo(0, callback);
 }
diff --git a/src/dfm-base/utils/fileinfohelper.h b/src/dfm-base/utils/fileinfohelper.h
@@ -23,11 +23,6 @@ namespace dfmbase {
 class FileInfoHelper : public QObject
 {
     Q_OBJECT
-public:
-    struct FileRefreshCallBackData{
-        FileInfoPointer info{ nullptr };
-    };
-
 public:
     ~FileInfoHelper() override;
     static FileInfoHelper &instance();
@@ -36,7 +31,6 @@ class FileInfoHelper : public QObject
                                                               const QString &inod, const bool isGvfs);
     void fileRefreshAsync(const QSharedPointer<dfmbase::FileInfo> dfileInfo);
     void cacheFileInfoByThread(const QSharedPointer<FileInfo> dfileInfo);
-    static void fileRefreshAsyncCallBack(bool success, void *userData);
 
 private:
     explicit FileInfoHelper(QObject *parent = nullptr);