Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 14:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(trail): check read() return for header bytes in readFrom/exportGpxFromFile

Browse Source 
Mirrors the Waypoint::readFrom() hardening — reject a truncated trail
snapshot instead of proceeding with garbage header fields. Consistency
with the waypoint store's persistence path.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
MarekZegare4
2026-06-14 12:53:40 +02:00
parent fcdacaa3bc
commit 1521be3803
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/companion_radio/Trail.h
View File

@@ -201,10 +201,10 @@ public:
uint8_t ver = 0, res = 0;
uint16_t cnt = 0;
uint32_t accum = 0;
file.read(&ver, 1);
file.read(&res, 1);
file.read((uint8_t*)&cnt, sizeof(cnt));
file.read((uint8_t*)&accum, sizeof(accum));
if (file.read(&ver, 1) != 1) return false;
if (file.read(&res, 1) != 1) return false;
if (file.read((uint8_t*)&cnt, sizeof(cnt)) != (int)sizeof(cnt)) return false;
if (file.read((uint8_t*)&accum, sizeof(accum)) != (int)sizeof(accum)) return false;
if (ver != SAVE_VERSION || cnt > CAPACITY) return false;
if (_active) {
_active = false;
@@ -344,10 +344,10 @@ public:
uint8_t ver = 0, res = 0;
uint16_t cnt = 0;
uint32_t accum = 0;
file.read(&ver, 1);
file.read(&res, 1);
file.read((uint8_t*)&cnt, sizeof(cnt));
file.read((uint8_t*)&accum, sizeof(accum));
if (file.read(&ver, 1) != 1) return 0;
if (file.read(&res, 1) != 1) return 0;
if (file.read((uint8_t*)&cnt, sizeof(cnt)) != (int)sizeof(cnt)) return 0;
if (file.read((uint8_t*)&accum, sizeof(accum)) != (int)sizeof(accum)) return 0;
if (ver != SAVE_VERSION || cnt > CAPACITY) return 0;
size_t total = gpxHeader(out);