From 03a0ebd9f7fe353e65ec2b660ffc8c43fd369f4d Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 25 Jun 2019 15:18:12 +0200
Subject: [PATCH] Some more assert to break the simu a little bit more in case
 of array overflow

---
 radio/src/simu.cpp                     | 8 ++++----
 radio/src/targets/simu/simpgmspace.cpp | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp
index df566bbea..eb8681e39 100644
--- a/radio/src/simu.cpp
+++ b/radio/src/simu.cpp
@@ -232,7 +232,7 @@ void OpenTxSim::doEvents()
 
 long OpenTxSim::onKeypress(FXObject *, FXSelector, void * v)
 {
-  FXEvent *evt = (FXEvent *)v;
+  auto * evt = (FXEvent *)v;
 
   // TRACE("keypress %x", evt->code);
 
@@ -245,7 +245,7 @@ long OpenTxSim::onKeypress(FXObject *, FXSelector, void * v)
 
 void OpenTxSim::updateKeysAndSwitches(bool start)
 {
-  static int keys1[] = {
+  static int keys[] = {
 #if defined(PCBHORUS)
     KEY_Page_Up,   KEY_PGUP,
     KEY_Page_Down, KEY_PGDN,
@@ -283,8 +283,8 @@ void OpenTxSim::updateKeysAndSwitches(bool start)
 #endif
   };
 
-  for (unsigned int i=0; i<DIM(keys1); i+=2) {
-    simuSetKey(keys1[i+1], start ? false : getApp()->getKeyState(keys1[i]));
+  for (unsigned int i=0; i<DIM(keys); i+=2) {
+    simuSetKey(keys[i+1], start ? false : getApp()->getKeyState(keys[i]));
   }
 
 #ifdef __APPLE__
diff --git a/radio/src/targets/simu/simpgmspace.cpp b/radio/src/targets/simu/simpgmspace.cpp
index 0c1160df5..c0d344bd7 100644
--- a/radio/src/targets/simu/simpgmspace.cpp
+++ b/radio/src/targets/simu/simpgmspace.cpp
@@ -142,12 +142,16 @@ void simuInit()
 bool keysStates[NUM_KEYS] = { false };
 void simuSetKey(uint8_t key, bool state)
 {
+  // TRACE("simuSetKey(%d, %d)", key, state);
+  assert(key < DIM(keysStates));
   keysStates[key] = state;
 }
 
-bool trimsStates[NUM_TRIMS*2] = { false };
+bool trimsStates[NUM_TRIMS * 2] = { false };
 void simuSetTrim(uint8_t trim, bool state)
 {
+  // TRACE("simuSetTrim(%d, %d)", trim, state);
+  assert(trim < DIM(trimsStates));
   trimsStates[trim] = state;
 }
 
@@ -155,6 +159,7 @@ int8_t switchesStates[NUM_SWITCHES] = { -1 };
 void simuSetSwitch(uint8_t swtch, int8_t state)
 {
   // TRACE("simuSetSwitch(%d, %d)", swtch, state);
+  assert(swtch < DIM(switchesStates));
   switchesStates[swtch] = state;
 }