From 1c94a3e3e5e6273216987041c926652c8bf6f34c Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Tue, 29 Oct 2024 00:40:13 +0200
Subject: [PATCH] fix leak on resource search

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 8e7d84d05beffac492522f4b2c0d9e638b15146b)
---
 .../helpers/NetworkResourceAPI.cpp            | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/launcher/modplatform/helpers/NetworkResourceAPI.cpp b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
index 974e732a7..7a234a8f8 100644
--- a/launcher/modplatform/helpers/NetworkResourceAPI.cpp
+++ b/launcher/modplatform/helpers/NetworkResourceAPI.cpp
@@ -43,11 +43,16 @@ Task::Ptr NetworkResourceAPI::searchProjects(SearchArgs&& args, SearchCallbacks&
         callbacks.on_succeed(doc);
     });
 
-    QObject::connect(netJob.get(), &NetJob::failed, [netJob, callbacks](const QString& reason) {
+    // Capture a weak_ptr instead of a shared_ptr to avoid circular dependency issues.
+    // This prevents the lambda from extending the lifetime of the shared resource,
+    // as it only temporarily locks the resource when needed.
+    auto weak = netJob.toWeakRef();
+    QObject::connect(netJob.get(), &NetJob::failed, [weak, callbacks](const QString& reason) {
         int network_error_code = -1;
-        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
-            network_error_code = failed_action->replyStatusCode();
-
+        if (auto netJob = weak.lock()) {
+            if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
+                network_error_code = failed_action->replyStatusCode();
+        }
         callbacks.on_fail(reason, network_error_code);
     });
     QObject::connect(netJob.get(), &NetJob::aborted, [callbacks] { callbacks.on_abort(); });
@@ -102,11 +107,17 @@ Task::Ptr NetworkResourceAPI::getProjectVersions(VersionSearchArgs&& args, Versi
 
         callbacks.on_succeed(doc, args.pack);
     });
-    QObject::connect(netJob.get(), &NetJob::failed, [netJob, callbacks](const QString& reason) {
-        int network_error_code = -1;
-        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
-            network_error_code = failed_action->replyStatusCode();
 
+    // Capture a weak_ptr instead of a shared_ptr to avoid circular dependency issues.
+    // This prevents the lambda from extending the lifetime of the shared resource,
+    // as it only temporarily locks the resource when needed.
+    auto weak = netJob.toWeakRef();
+    QObject::connect(netJob.get(), &NetJob::failed, [weak, callbacks](const QString& reason) {
+        int network_error_code = -1;
+        if (auto netJob = weak.lock()) {
+            if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
+                network_error_code = failed_action->replyStatusCode();
+        }
         callbacks.on_fail(reason, network_error_code);
     });
 
@@ -153,11 +164,17 @@ Task::Ptr NetworkResourceAPI::getDependencyVersion(DependencySearchArgs&& args,
 
         callbacks.on_succeed(doc, args.dependency);
     });
-    QObject::connect(netJob.get(), &NetJob::failed, [netJob, callbacks](const QString& reason) {
-        int network_error_code = -1;
-        if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
-            network_error_code = failed_action->replyStatusCode();
 
+    // Capture a weak_ptr instead of a shared_ptr to avoid circular dependency issues.
+    // This prevents the lambda from extending the lifetime of the shared resource,
+    // as it only temporarily locks the resource when needed.
+    auto weak = netJob.toWeakRef();
+    QObject::connect(netJob.get(), &NetJob::failed, [weak, callbacks](const QString& reason) {
+        int network_error_code = -1;
+        if (auto netJob = weak.lock()) {
+            if (auto* failed_action = netJob->getFailedActions().at(0); failed_action)
+                network_error_code = failed_action->replyStatusCode();
+        }
         callbacks.on_fail(reason, network_error_code);
     });
     return netJob;