Skip to content

fix(firmware): potential crash when using multi protocol module. #7039

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

Merged
pfeerick merged 2 commits into from
Jan 27, 2026
+8 −5
Merged

fix(firmware): potential crash when using multi protocol module. #7039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1d76a3
Fix stack overflow.
Jan 26, 2026
977eefd
Remove need for tmp buffer.
Jan 26, 2026
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
7 changes: 2 additions & 5 deletions radio/src/io/multi_protolist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,7 @@ std::string MultiRfProtocols::getProtoLabel(unsigned int proto) const
if (status.protocolName[0] && status.isValid()) {
return std::string(status.protocolName);
} else if (proto <= MODULE_SUBTYPE_MULTI_LAST) {
char tmp[8];
getStringAtIndex(tmp, STR_MULTI_PROTOCOLS, proto);
return std::string(tmp);
return getStringAtIndex(STR_MULTI_PROTOCOLS, proto);
}
} else {
int idx = getIndex(proto);
Expand Down Expand Up @@ -322,8 +320,7 @@ void MultiRfProtocols::fillBuiltinProtos()

if (pdef->protocol == MM_RF_CUSTOM_SELECTED) break; // skip custom proto

char tmp[8];
rfProto.label = getStringAtIndex(tmp, STR_MULTI_PROTOCOLS, pdef->protocol);
rfProto.label = getStringAtIndex(STR_MULTI_PROTOCOLS, pdef->protocol);
rfProto.flags =
(pdef->failsafe ? 0x01 : 0) | (pdef->disable_ch_mapping ? 0x02 : 0);

Expand Down
5 changes: 5 additions & 0 deletions radio/src/strhelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ char *strcat_zchar(char *dest, const char *name, uint8_t size,
#endif

#if !defined(BOOT)
std::string getStringAtIndex(const char *const *s, int idx)
{
return std::string(s[idx]);
}

char *getStringAtIndex(char *dest, const char *const *s, int idx)
{
strcpy(dest, s[idx]);
Expand Down
1 change: 1 addition & 0 deletions radio/src/strhelpers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ void formatNumberAsString(char *buffer, const uint8_t buffer_size, int32_t val,

#if !defined(BOOT)
char *getStringAtIndex(char *dest, const char *const *s, int idx);
std::string getStringAtIndex(const char *const *s, int idx);
char *strAppendStringWithIndex(char *dest, const char *s, int idx);
#define LEN_TIMER_STRING 10 // "-00:00:00"
char *getTimerString(char *dest, int32_t tme,
Expand Down