Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cpn): function switches induced crash #5620

Merged
merged 1 commit into from
Oct 17, 2024
Merged

fix(cpn): function switches induced crash #5620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions companion/src/firmwares/boardjson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ int BoardJson::getInputTypeOffset(const InputsTable * inputs, Board::AnalogInput
return i;
}

return 0;
return -1;
}

const Board::InputInfo BoardJson::getInputInfo(int index) const
Expand Down Expand Up @@ -531,7 +531,7 @@ int BoardJson::getSwitchTypeOffset(const SwitchesTable * switches, Board::Switch
return i;
}

return 0;
return -1;
}

const int BoardJson::getSwitchYamlIndex(const QString val, YamlLookupType ylt) const
Expand Down Expand Up @@ -629,7 +629,7 @@ const QString BoardJson::getTrimYamlName(int index, YamlLookupType ylt) const

const bool BoardJson::isInputAvailable(int index) const
{
return isInputAvailable(m_inputs->at(index));
return (index >=0 && index < m_inputs->size()) ? isInputAvailable(m_inputs->at(index)) : false;
}

// static
Expand All @@ -641,7 +641,7 @@ bool BoardJson::isInputAvailable(const InputDefn & defn)

const bool BoardJson::isInputCalibrated(int index) const
{
return isInputCalibrated(m_inputs->at(index));
return (index >=0 && index < m_inputs->size()) ? isInputCalibrated(m_inputs->at(index)) : false;
}

// static
Expand All @@ -652,7 +652,7 @@ bool BoardJson::isInputCalibrated(const InputDefn & defn)

const bool BoardJson::isInputConfigurable(int index) const
{
return isInputConfigurable(m_inputs->at(index));
return (index >=0 && index < m_inputs->size()) ? isInputConfigurable(m_inputs->at(index)) : false;
}

// static
Expand All @@ -663,7 +663,7 @@ bool BoardJson::isInputConfigurable(const InputDefn & defn)

const bool BoardJson::isInputIgnored(int index) const
{
return isInputIgnored(m_inputs->at(index));
return (index >=0 && index < m_inputs->size()) ? isInputIgnored(m_inputs->at(index)) : true;
}

// static
Expand Down Expand Up @@ -698,7 +698,7 @@ bool BoardJson::isInputFlexJoystickAxis(const InputDefn & defn)

const bool BoardJson::isInputFlexPot(int index) const
{
return isInputFlexPot(m_inputs->at(index));
return (index >=0 && index < m_inputs->size()) ? isInputFlexPot(m_inputs->at(index)) : false;
}

// static
Expand Down Expand Up @@ -741,7 +741,7 @@ bool BoardJson::isInputRTCBat(const InputDefn & defn)

const bool BoardJson::isInputStick(int index) const
{
return isInputStick(m_inputs->at(index));
return (index >=0 && index < m_inputs->size()) ? isInputStick(m_inputs->at(index)) : false;
}

// static
Expand All @@ -752,7 +752,7 @@ bool BoardJson::isInputStick(const InputDefn & defn)

const bool BoardJson::isInputSwitch(int index) const
{
return isInputSwitch(m_inputs->at(index));
return (index >=0 && index < m_inputs->size()) ? isInputSwitch(m_inputs->at(index)) : false;
}

// static
Expand Down Expand Up @@ -792,7 +792,7 @@ bool BoardJson::isSwitchStd(const SwitchDefn & defn)

const bool BoardJson::isSwitchFlex(int index) const
{
return isSwitchFlex(m_switches->at(index));
return (index >=0 && index < m_switches->size()) ? isSwitchFlex(m_switches->at(index)) : false;
}

// static
Expand All @@ -806,7 +806,7 @@ bool BoardJson::isSwitchFlex(const SwitchDefn & defn)

const bool BoardJson::isSwitchFunc(int index) const
{
return isSwitchFunc(m_switches->at(index));
return (index >=0 && index < m_switches->size()) ? isSwitchFunc(m_switches->at(index)) : false;
}

// static
Expand Down
2 changes: 1 addition & 1 deletion companion/src/firmwares/customfunctiondata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ QString CustomFunctionData::funcToString(const AssignFunc func, const ModelData
return tr("RGB leds");
else if (func == FuncLCDtoVideo)
return tr("LCD to Video");
else if (func >= FuncPushCustomSwitch1 && func <= FuncPushCustomSwitchLast) {
else if (func >= FuncPushCustomSwitch1 && func <= FuncPushCustomSwitchLast && Boards::getCapability(getCurrentBoard(), Board::FunctionSwitches)) {
const int idx = Boards::getSwitchTypeOffset(Board::SWITCH_FUNC) + func - FuncPushCustomSwitch1 + 1;
return tr("Push Custom Switch %1").arg(RawSource(SOURCE_TYPE_SWITCH, idx).toString(model));
}
Expand Down
Loading