From b67decfba06bbcafbb6909157b46a37c09106930 Mon Sep 17 00:00:00 2001 From: Scott Powell Date: Thu, 26 Feb 2026 15:36:21 +1100 Subject: [PATCH] * bug fix: Packet::writeTo(), Packet::readFrom() --- src/Packet.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Packet.cpp b/src/Packet.cpp index 934020b3..aad3e2f4 100644 --- a/src/Packet.cpp +++ b/src/Packet.cpp @@ -57,7 +57,7 @@ uint8_t Packet::writeTo(uint8_t dest[]) const { memcpy(&dest[i], &transport_codes[1], 2); i += 2; } dest[i++] = path_len; - memcpy(&dest[i], path, path_len); i += path_len; + i += writePath(&dest[i], path, path_len); memcpy(&dest[i], payload, payload_len); i += payload_len; return i; } @@ -72,8 +72,11 @@ bool Packet::readFrom(const uint8_t src[], uint8_t len) { transport_codes[0] = transport_codes[1] = 0; } path_len = src[i++]; - if (path_len > sizeof(path)) return false; // bad encoding - memcpy(path, &src[i], path_len); i += path_len; + if (!isValidPathLen(path_len)) return false; // bad encoding + + uint8_t bl = getPathByteLen(); + memcpy(path, &src[i], bl); i += bl; + if (i >= len) return false; // bad encoding payload_len = len - i; if (payload_len > sizeof(payload)) return false; // bad encoding