FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tighten up name filters on Unix. Fixes bug 168.

Browse Source
This commit is contained in:
James Turner 2010-11-15 23:23:40 +00:00
parent 9f88b077ee
commit 56c520f455
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/misc/sg_dir.cxx
View File

@ -106,6 +106,8 @@ PathList Dir::children(int types, const std::string& nameFilter) const
return result;
}
int filterLen = nameFilter.size();
while (true) {
struct dirent* entry = readdir(dp);
if (!entry) {
@ -144,7 +146,13 @@ PathList Dir::children(int types, const std::string& nameFilter) const
}
if (!nameFilter.empty()) {
if (strstr(entry->d_name, nameFilter.c_str()) == NULL) {
int nameLen = strlen(entry->d_name);
if (nameLen < filterLen) {
continue; // name is shorter than the filter
}
char* nameSuffix = entry->d_name + (nameLen - filterLen);
if (strcmp(nameSuffix, nameFilter.c_str())) {
continue;
}
}