From f66d900ae29a92810db0d041612cb6994a18bdea Mon Sep 17 00:00:00 2001 From: Scott Powell Date: Wed, 30 Jul 2025 14:57:38 +1000 Subject: [PATCH] * companion: bug fix for CMD_ADD_UPDATE_CONTACT --- examples/companion_radio/MyMesh.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index a7c0333c..9b6a56e2 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/examples/companion_radio/MyMesh.cpp @@ -166,12 +166,12 @@ void MyMesh::updateContactFromFrame(ContactInfo &contact, uint32_t& last_mod, co i += 32; memcpy(&contact.last_advert_timestamp, &frame[i], 4); i += 4; - if (i + 8 >= len) { // optional fields + if (len >= i + 8) { // optional fields memcpy(&contact.gps_lat, &frame[i], 4); i += 4; memcpy(&contact.gps_lon, &frame[i], 4); i += 4; - if (i + 4 >= len) { + if (len >= i + 4) { memcpy(&last_mod, &frame[i], 4); } }