fix(TaskManager): memory leak #4949 (#4950)

aleks-f · web-flow · commit 5e5e1a60f90e · 2025-05-19T11:44:28.000+02:00
diff --git a/Foundation/src/TaskManager.cpp b/Foundation/src/TaskManager.cpp
@@ -67,14 +67,20 @@ bool TaskManager::start(Task* pTask)
 		pTask->setState(Task::TASK_STARTING);
 		try
 		{
+			{
+				ScopedLockT lock(_mutex);
+				_taskList.push_back(pAutoTask);
+			}
 			_threadPool.start(*pTask, pTask->name());
-			ScopedLockT lock(_mutex);
-			_taskList.push_back(pAutoTask);
 			return true;
 		}
 		catch (...)
 		{
 			pTask->setOwner(nullptr);
+
+			ScopedLockT lock(_mutex);
+			auto it = std::find(_taskList.begin(), _taskList.end(), pTask);
+			if (it != _taskList.end()) _taskList.erase(it);
 			throw;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,20 @@ bool TaskManager::start(Task* pTask)`
`67`	`67`	`pTask->setState(Task::TASK_STARTING);`
`68`	`68`	`try`
`69`	`69`	`{`
	`70`	`+ {`
	`71`	`+ ScopedLockT lock(_mutex);`
	`72`	`+ _taskList.push_back(pAutoTask);`
	`73`	`+ }`
`70`	`74`	`_threadPool.start(*pTask, pTask->name());`
`71`		`- ScopedLockT lock(_mutex);`
`72`		`- _taskList.push_back(pAutoTask);`
`73`	`75`	`return true;`
`74`	`76`	`}`
`75`	`77`	`catch (...)`
`76`	`78`	`{`
`77`	`79`	`pTask->setOwner(nullptr);`
	`80`	`+`
	`81`	`+ ScopedLockT lock(_mutex);`
	`82`	`+ auto it = std::find(_taskList.begin(), _taskList.end(), pTask);`
	`83`	`+ if (it != _taskList.end()) _taskList.erase(it);`
`78`	`84`	`throw;`
`79`	`85`	`}`
`80`	`86`	`}`