Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-09-14 15:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2917 from jirogit/fix/regionmap-load-eof-handling

Browse Source 
fix(RegionMap): load() returns actual read success instead of hardcoded true
This commit is contained in:
ripplebiz
2026-07-13 18:28:26 +10:00
committed by GitHub
parent 174bcdfbcc 8ef369058d
commit b81fb8ebe8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/RegionMap.cpp
+5 -3
View File
@@ -93,13 +93,15 @@ bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
while (num_regions < MAX_REGION_ENTRIES) { while (num_regions < MAX_REGION_ENTRIES) {
auto r = &regions[num_regions]; auto r = &regions[num_regions];
success = file.read((uint8_t *) &r->id, sizeof(r->id)) == sizeof(r->id); int n = file.read((uint8_t *) &r->id, sizeof(r->id));
if (n == 0) break; // clean EOF
success = (n == sizeof(r->id));
success = success && file.read((uint8_t *) &r->parent, sizeof(r->parent)) == sizeof(r->parent); success = success && file.read((uint8_t *) &r->parent, sizeof(r->parent)) == sizeof(r->parent);
success = success && file.read((uint8_t *) r->name, sizeof(r->name)) == sizeof(r->name); success = success && file.read((uint8_t *) r->name, sizeof(r->name)) == sizeof(r->name);
success = success && file.read((uint8_t *) &r->flags, sizeof(r->flags)) == sizeof(r->flags); success = success && file.read((uint8_t *) &r->flags, sizeof(r->flags)) == sizeof(r->flags);
success = success && file.read(pad, sizeof(pad)) == sizeof(pad); success = success && file.read(pad, sizeof(pad)) == sizeof(pad);
if (!success) break; // EOF if (!success) break; // partial read or corruption
if (r->id >= next_id) { // make sure next_id is valid if (r->id >= next_id) { // make sure next_id is valid
next_id = r->id + 1; next_id = r->id + 1;
@@ -108,7 +110,7 @@ bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
} }
} }
file.close(); file.close();
return true; return success;
} }
} }
return false; // failed return false; // failed