Core/DBLayer: Fixed an incredibly rare memory leak happening when player started loading from database and never finished

2 files changed, 13 insertions, 3 deletions

diff --git a/src/server/shared/Database/QueryHolder.cpp b/src/server/shared/Database/QueryHolder.cpp
index bd938561b50..f0dc3c96e4e 100644
--- a/src/server/shared/Database/QueryHolder.cpp
+++ b/src/server/shared/Database/QueryHolder.cpp
@@ -166,8 +166,16 @@ void SQLQueryHolder::SetSize(size_t size)
     m_queries.resize(size);
 }
 
+SQLQueryHolderTask::~SQLQueryHolderTask()
+{
+    if (!m_executed)
+        delete m_holder;
+}
+
 bool SQLQueryHolderTask::Execute()
 {
+    m_executed = true;
+
     if (!m_holder)
         return false;
 
diff --git a/src/server/shared/Database/QueryHolder.h b/src/server/shared/Database/QueryHolder.h
index 273980c3ac5..39e51b591c5 100644
--- a/src/server/shared/Database/QueryHolder.h
+++ b/src/server/shared/Database/QueryHolder.h
@@ -47,14 +47,16 @@ class SQLQueryHolderTask : public SQLOperation
     private:
         SQLQueryHolder* m_holder;
         QueryResultHolderPromise m_result;
+        bool m_executed;
 
     public:
         SQLQueryHolderTask(SQLQueryHolder* holder)
-            : m_holder(holder) { };
+            : m_holder(holder), m_executed(false) { }
+
+        ~SQLQueryHolderTask();
 
         bool Execute() override;
         QueryResultHolderFuture GetFuture() { return m_result.get_future(); }
-
 };
 
-#endif
\ No newline at end of file
+#endif