kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Reserve the [Exit] slot when splitting canned messages (#11095)

Browse Source 
splitConfiguredMessages capped the split loop at
CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT and then appended [Exit]
unconditionally, so messages[] could be written one past its last index
and messagesCount could exceed the array size.
This commit is contained in:
Thomas Göttgens
2026-07-20 17:31:21 -05:00
committed by GitHub
co-authored by GitHub
parent 0199a1f3ff
commit e061335055
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/CannedMessageModule.cpp
+1 -1
View File
@@ -179,7 +179,7 @@ int CannedMessageModule::splitConfiguredMessages()
while (i < upTo) { while (i < upTo) {
if (this->messageBuffer[i] == '|') { if (this->messageBuffer[i] == '|') {
this->messageBuffer[i] = '\0'; // End previous message this->messageBuffer[i] = '\0'; // End previous message
if (tempCount >= CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT) if (tempCount >= CANNED_MESSAGE_MODULE_MESSAGE_MAX_COUNT - 1)
break; break;
tempMessages[tempCount++] = (this->messageBuffer + i + 1); tempMessages[tempCount++] = (this->messageBuffer + i + 1);
} }