Mirrors_Framework/ardupilot
1
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot.git synced 2026-10-02 10:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

AP_ROMFS: don't read past a shorter name when skipping duplicate directories

Browse Source 
dir_list() compares an entry's leading directory with the previous
entry's using memcmp() over the directory's length, which reads past the
end of the previous name when that is shorter. strncmp() stops at its
end.
This commit is contained in:
Peter Barker
2026-09-24 18:35:09 +10:00
committed by Peter Barker
parent 7296d28042
commit 818be63b54
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/AP_ROMFS/AP_ROMFS.cpp
+2 -1
View File
@@ -133,7 +133,8 @@ const char *AP_ROMFS::dir_list(const char *dirname, uint16_t &ofs)
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) {
// strncmp, not memcmp: the previous name may be shorter
if (strncmp(files[ofs].filename, files[ofs-1].filename, len+dlen+1) == 0) {
continue;
}
}