Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-06 16:27:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

rfb: fix code api passing invalid string length

Browse Source 
broken in c45a1ec097 converting from ptr to sv
point to the null char, not the actual buffer storage end

resulting sv length is off-by-one, unless converted to a string obj
This commit is contained in:
Maxim Prokhorov
2024-12-28 05:09:26 +03:00
parent 332d29bdf4
commit bd2e52af87
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/espurna/rfbridge.cpp
View File

@@ -51,6 +51,12 @@ void rfbOnCode(RfbCodeHandler handler) {
_rfb_code_handlers.push_front(handler);
}
static void _rfbCode(unsigned char protocol, espurna::StringView code) {
for (auto& handler : _rfb_code_handlers) {
handler(protocol, code);
}
}
// -----------------------------------------------------------------------------
// MATCH RECEIVED CODE WITH THE SPECIFIC RELAY ID
// -----------------------------------------------------------------------------
@@ -729,12 +735,8 @@ void _rfbParse(uint8_t code, const std::vector<uint8_t>& payload) {
mqttSend(MQTT_TOPIC_RFIN, buffer, false, false);
#endif
for (auto& handler : _rfb_code_handlers) {
const auto begin = std::begin(buffer) + 12;
const auto end = std::end(buffer);
handler(RfbDefaultProtocol,
espurna::StringView(begin, end));
}
_rfbCode(RfbDefaultProtocol,
espurna::StringView(buffer).slice(12));
}
break;
}
@@ -742,6 +744,7 @@ void _rfbParse(uint8_t code, const std::vector<uint8_t>& payload) {
case CodeRecvProto:
case CodeRecvBucket: {
_rfbAckImpl();
char buffer[(RfbParser::MessageSizeMax * 2) + 1] = {0};
if (hexEncode(payload.data(), payload.size(), buffer, sizeof(buffer))) {
DEBUG_MSG_P(PSTR("[RF] Received %s code: %s\n"),
@@ -753,12 +756,8 @@ void _rfbParse(uint8_t code, const std::vector<uint8_t>& payload) {
#endif
// ref. https://github.com/Portisch/RF-Bridge-EFM8BB1/wiki/0xA6#example-of-a-received-decoded-protocol
for (auto& handler : _rfb_code_handlers) {
const auto begin = std::begin(buffer) + 2;
const auto end = std::end(buffer);
handler(payload[0],
espurna::StringView(begin, end));
}
_rfbCode(payload[0],
espurna::StringView(buffer).slice(2));
} else {
DEBUG_MSG_P(PSTR("[RF] Received 0x%02X (%u bytes)\n"), code, payload.size());
}