piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Stop Companion crash when conversion source index out of range (#8470)

Browse Source
This commit is contained in:
Neil Horne
2021-04-24 12:59:21 +02:00
committed by GitHub
parent 890888f3e3
commit ddd033f034
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/rawsource.cpp
+4 -1
View File
@@ -351,8 +351,11 @@ RawSource RawSource::convert(RadioDataConversionState & cstate)
if (type == SOURCE_TYPE_SWITCH) { if (type == SOURCE_TYPE_SWITCH) {
QStringList fromSwitchList(getSwitchList(cstate.fromBoard)); QStringList fromSwitchList(getSwitchList(cstate.fromBoard));
QStringList toSwitchList(getSwitchList(cstate.toBoard)); QStringList toSwitchList(getSwitchList(cstate.toBoard));
index = toSwitchList.indexOf(fromSwitchList.at(oldData.id));
// index set to -1 if no match found // index set to -1 if no match found
if (oldData.id < fromSwitchList.count())
index = toSwitchList.indexOf(fromSwitchList.at(oldData.id));
else
index = -1;
// perform forced mapping // perform forced mapping
if (index < 0) { if (index < 0) {
if (IS_TARANIS_X7(cstate.toType) && (IS_TARANIS_X9(cstate.fromType) || IS_FAMILY_HORUS_OR_T16(cstate.fromType))) { if (IS_TARANIS_X7(cstate.toType) && (IS_TARANIS_X9(cstate.fromType) || IS_FAMILY_HORUS_OR_T16(cstate.fromType))) {