Merge remote-tracking branch 'krobelus/fix-remap-uaf'

1 files changed, 3 insertions, 0 deletions

diff --git a/src/keymap_manager.cc b/src/keymap_manager.cc
index 81efe7ed..26579bf7 100644
--- a/src/keymap_manager.cc
+++ b/src/keymap_manager.cc
@@ -13,6 +13,9 @@ namespace Kakoune
 void KeymapManager::map_key(Key key, KeymapMode mode,
                             KeyList mapping, String docstring)
 {
+    if (auto it = m_mapping.find(KeyAndMode{key, mode}); it != m_mapping.end())
+        if (it->value.is_executing)
+            throw runtime_error("cannot map key that is currently executing");
     m_mapping[KeyAndMode{key, mode}] = {std::move(mapping), std::move(docstring)};
 }