debuggerx/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2026-08-17 05:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hid_core] fix LM2 crash due to callbacks not being removed properly (#4178)

Browse Source 
the function returned the key AFTER this one, which points to an invalid object
basically its like "oh im returning the index AFTER Myself"
off-by-1 error basically; now it returns OUR own key.

Signed-off-by: lizzie <lizzie@eden-emu.dev>

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4178
Reviewed-by: MaranBr <maranbr@eden-emu.dev>
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
This commit is contained in:
lizzie
2026-07-07 19:52:22 +02:00
committed by crueter
parent bfc0e60333
commit 6119e8fad2
7 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input_common/input_engine.cpp
+6 -7
View File
@@ -4,6 +4,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#include "common/logging.h"
#include "common/assert.h"
#include "input_common/input_engine.h"
namespace InputCommon {
@@ -463,8 +464,9 @@ const std::string& InputEngine::GetEngineName() const {
int InputEngine::SetCallback(InputIdentifier input_identifier) {
std::scoped_lock lock{mutex_callback};
++last_callback_key;
callback_list.insert_or_assign(last_callback_key, std::move(input_identifier));
return last_callback_key++;
return last_callback_key;
}
void InputEngine::SetMappingCallback(MappingCallback callback) {
@@ -474,12 +476,9 @@ void InputEngine::SetMappingCallback(MappingCallback callback) {
void InputEngine::DeleteCallback(int key) {
std::scoped_lock lock{mutex_callback};
const auto& iterator = callback_list.find(key);
if (iterator == callback_list.end()) {
LOG_ERROR(Input, "Tried to delete non-existent callback {}", key);
return;
}
callback_list.erase(iterator);
auto const it = callback_list.find(key);
ASSERT_MSG(it != callback_list.end(), "Tried to delete non-existent callback {}", key);
callback_list.erase(it);
}
} // namespace InputCommon