games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Fix (mostly false-positive) memory leaks in task dispatching

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-27 18:05:19 +03:00
parent cd2837a84e
commit 3547635c05
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/eventsSDL/InputHandler.cpp
View File

@@ -405,23 +405,31 @@ int InputHandler::getNumTouchFingers() const
void InputHandler::dispatchMainThread(const std::function<void()> & functor)
{
auto heapFunctor = new std::function<void()>(functor);
auto heapFunctor = std::make_unique<std::function<void()>>(functor);
SDL_Event event;
event.user.type = SDL_USEREVENT;
event.user.code = 0;
event.user.data1 = static_cast <void*>(heapFunctor);
event.user.data1 = static_cast <void*>(heapFunctor.get());
event.user.data2 = nullptr;
SDL_PushEvent(&event);
// NOTE: approach with dispatchedTasks container is a bit excessive
// used mostly to prevent false-positives leaks in analyzers
dispatchedTasks.push(std::move(heapFunctor));
}
void InputHandler::handleUserEvent(const SDL_UserEvent & current)
{
auto heapFunctor = static_cast<std::function<void()>*>(current.data1);
std::unique_ptr<std::function<void()>> task;
(*heapFunctor)();
if (!dispatchedTasks.try_pop(task))
throw std::runtime_error("InputHandler::handleUserEvent received without active task!");
delete heapFunctor;
if (current.data1 != task.get())
throw std::runtime_error("InputHandler::handleUserEvent received unknown pointer!");
(*task)();
}
const Point & InputHandler::getCursorPosition() const

3
client/eventsSDL/InputHandler.h
View File

@@ -12,6 +12,8 @@
#include "../lib/Rect.h"
#include <tbb/concurrent_queue.h>
enum class EUserEvent;
enum class MouseButton;
union SDL_Event;
@@ -33,6 +35,7 @@ enum class InputMode
class InputHandler
{
std::vector<SDL_Event> eventsQueue;
tbb::concurrent_queue<std::unique_ptr<std::function<void()>>> dispatchedTasks;
std::mutex eventsMutex;
Point cursorPosition;