liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Memory leak in RefreshMapper, fixes #5323

Browse Source
This commit is contained in:
heckflosse
2019-05-18 18:44:06 +02:00
parent 351f8f4e12
commit 159e1784f4
3 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rtgui/eventmapper.cc
View File

@@ -19,12 +19,13 @@
*/
#include "eventmapper.h"
#include "multilangmgr.h"
ProcEventMapper::ProcEventMapper()
{
for (int event = 0; event < rtengine::NUMOFEVENTS; ++event) {
history_msgs_[event] = "HISTORY_MSG_" + std::to_string(event + 1);
history_msgs_[event] = M("HISTORY_MSG_" + std::to_string(event + 1));
}
}
@@ -38,16 +39,22 @@ ProcEventMapper *ProcEventMapper::getInstance()
rtengine::ProcEvent ProcEventMapper::newEvent(int action, const std::string &history_msg)
{
rtengine::ProcEvent event = rtengine::RefreshMapper::getInstance()->newEvent();
rtengine::RefreshMapper::getInstance()->mapEvent(event, action);
std::string eventkey = std::to_string(action) + history_msg;
const auto ret = events_.find(eventkey);
if (ret == events_.end()) {
rtengine::ProcEvent event = rtengine::RefreshMapper::getInstance()->newEvent();
rtengine::RefreshMapper::getInstance()->mapEvent(event, action);
events_.emplace(std::move(eventkey), event);
if (history_msg.empty()) {
history_msgs_[event] = M("HISTORY_MSG_" + std::to_string(event + 1));
} else {
history_msgs_[event] = M(history_msg);
}
if (history_msg.empty()) {
history_msgs_[event] = "HISTORY_MSG_" + std::to_string(event + 1);
return event;
} else {
history_msgs_[event] = history_msg;
return ret->second;
}
return event;
}