A couple more cases where Dynamic Macros could get itself stuck in a

nearly-infinite loop with bad data.
keyboardio · Mar 5, 2024 · 56dbb2d · 56dbb2d
1 parent 6bd594b
commit 56dbb2d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.cpp b/plugins/Kaleidoscope-DynamicMacros/src/kaleidoscope/plugin/DynamicMacros.cpp
@@ -76,7 +76,7 @@ uint8_t DynamicMacros::updateDynamicMacroCache() {
       uint8_t keyCode, flags;
       do {
         keyCode = Runtime.storage().read(pos++);
-      } while (keyCode != 0);
+      } while ((pos < (storage_base_ + storage_size_)) && keyCode != 0);
       break;
     }
 
@@ -170,7 +170,7 @@ void DynamicMacros::play(uint8_t macro_id) {
       while (true) {
         key.setFlags(isKeycodeSequence ? 0 : storage.read(pos++));
         key.setKeyCode(storage.read(pos++));
-        if (key == Key_NoKey)
+        if (key == Key_NoKey || pos >= storage_base_ + storage_size_)
           break;
         tap(key);
         delay(interval);