Merge pull request #3643 from marcelverdult/upstream-candidate/companion-channel-txt-min-len

Fix companion crash on a short CMD_SEND_CHANNEL_TXT_MSG frame
This commit is contained in:
ripplebiz authored and GitHub committed 2026-10-24 11:40:49 +11:00
commit cd9f97fd4a
2 files changed
+8 -1

No files matched your search

+5
View File
@@ -516,6 +516,11 @@ int BaseChatMesh::sendCommandData(const ContactInfo& recipient, uint32_t timest
}
bool BaseChatMesh::sendGroupMessage(uint32_t timestamp, mesh::GroupChannel& channel, const char* sender_name, const char* text, int text_len) {
if (text_len < 0) { // memcpy() below would read this as a size_t, so clamping cannot catch it
MESH_DEBUG_PRINTLN("sendGroupMessage: invalid negative text_len=%d", text_len);
return false;
}
uint8_t temp[5+MAX_TEXT_LEN+32];
memcpy(temp, &timestamp, 4); // mostly an extra blob to help make packet_hash unique
temp[4] = 0; // TXT_TYPE_PLAIN