Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_ROMFS: fixed duplicate directories

This commit is contained in:
Andrew Tridgell 2024-02-21 12:58:08 +11:00
parent c7a729b7f6
commit feff639c15
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/AP_ROMFS/AP_ROMFS.cpp
View File

@ -66,6 +66,12 @@ const uint8_t *AP_ROMFS::find_decompress(const char *name, uint32_t &size)
return nullptr; return nullptr;
} }
if (f->decompressed_size == 0) {
// empty file
size = 0;
return decompressed_data;
}
// explicitly null-terminate the data // explicitly null-terminate the data
decompressed_data[f->decompressed_size] = 0; decompressed_data[f->decompressed_size] = 0;
@ -117,7 +123,23 @@ const char *AP_ROMFS::dir_list(const char *dirname, uint16_t &ofs)
{ {
const size_t dlen = strlen(dirname); const size_t dlen = strlen(dirname);
for ( ; ofs < ARRAY_SIZE(files); ofs++) { for ( ; ofs < ARRAY_SIZE(files); ofs++) {
if ((dlen == 0) || (strncmp(dirname, files[ofs].filename, dlen) == 0)) { if (strncmp(dirname, files[ofs].filename, dlen) == 0) {
const char last_char = files[ofs].filename[dlen];
if (dlen != 0 && last_char != '/' && last_char != 0) {
// only a partial match, skip
continue;
}
/*
prevent duplicate directories
*/
const char *start_name = files[ofs].filename + dlen + 1;
const char *slash = strchr(start_name, '/');
if (ofs > 0 && slash != nullptr) {
auto len = slash - start_name;
if (memcmp(files[ofs].filename, files[ofs-1].filename, len+dlen+1) == 0) {
continue;
}
}
// found one // found one
return files[ofs++].filename; return files[ofs++].filename;
} }