Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 23:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(companion): null-guard geo-alert picker, clamp loc-share channel idx on load

Browse Source 
GeoAlertScreen::openPicker() is reachable directly from handleInput()'s
Target row, bypassing the _prefs null-check every other path in this
screen goes through via activate(). DataStore's loc_share_channel_idx
was the only loc_share_* field without a clamp-on-load, unlike its
sibling index fields (harmless today since getChannel() bounds-checks
it, but inconsistent with the established defensive pattern).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
MarekZegare4
2026-06-23 12:05:36 +02:00
parent 4c37bc1b5d
commit cc68f77031
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
examples/companion_radio/DataStore.cpp
View File

@@ -372,6 +372,7 @@ void DataStore::loadPrefsInt(const char *filename, NodePrefs& _prefs, double& no
rd(&_prefs.loc_share_heartbeat_idx, sizeof(_prefs.loc_share_heartbeat_idx));
if (_prefs.loc_share_enabled > 1) _prefs.loc_share_enabled = 0;
if (_prefs.loc_share_target_type > 1) _prefs.loc_share_target_type = 0;
if (_prefs.loc_share_channel_idx >= MAX_GROUP_CHANNELS) _prefs.loc_share_channel_idx = 0;
if (_prefs.loc_share_move_idx >= NodePrefs::LOC_SHARE_MOVE_COUNT) _prefs.loc_share_move_idx = 1;
if (_prefs.loc_share_interval_idx >= NodePrefs::LOC_SHARE_INTERVAL_COUNT) _prefs.loc_share_interval_idx = 1;
if (_prefs.loc_share_heartbeat_idx >= NodePrefs::LOC_SHARE_HEARTBEAT_COUNT) _prefs.loc_share_heartbeat_idx = 0;

1
examples/companion_radio/ui-new/GeoAlertScreen.h
View File

@@ -211,6 +211,7 @@ public:
}
void openPicker() {
if (!_prefs) return;
buildTargets();
if (_target_n == 0) { _task->showAlert("No favs / waypoints", 1400); return; }
int cur = currentTargetIndex();