dandri/HaloKeymind
1
0
Fork 0
mirror of https://github.com/mikecarper/MeshCore.git synced 2026-07-30 18:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream dev

Browse Source
This commit is contained in:
mikecarper
2026-07-17 16:17:16 -07:00
parent f018537201 795989b918
commit f7b7edf393
60 changed files with 3581 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/helpers/RegionMap.cpp
+7 -6
View File
@@ -93,14 +93,12 @@ bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
success = success && file.read((uint8_t *) &loaded_wildcard_flags, sizeof(loaded_wildcard_flags)) == sizeof(loaded_wildcard_flags);
success = success && file.read((uint8_t *) &loaded_next, sizeof(loaded_next)) == sizeof(loaded_next);
while (success && file.available() > 0) {
if (loaded_count >= MAX_REGION_ENTRIES) {
success = false;
break;
}
while (success && loaded_count < MAX_REGION_ENTRIES) {
RegionEntry& r = loaded[loaded_count];
memset(&r, 0, sizeof(r));
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.name, sizeof(r.name)) == sizeof(r.name);
success = success && file.read((uint8_t *) &r.flags, sizeof(r.flags)) == sizeof(r.flags);
@@ -122,6 +120,9 @@ bool RegionMap::load(FILESYSTEM* _fs, const char* path) {
if (!success) break;
loaded_count++;
}
if (success && loaded_count == MAX_REGION_ENTRIES && file.read() >= 0) {
success = false; // more data than the table can hold
}
file.close();
// Validate IDs and parent links only after every record is present so forward