From 876496c953d4c9c4b12befbdf4d41fe839644ac9 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 7 Aug 2016 12:50:19 +0200 Subject: Removed "." and ".." from cFile:GetFolderContents(). (#3301) --- src/OSSupport/File.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp index b4e4c3f6f..a59f599ae 100644 --- a/src/OSSupport/File.cpp +++ b/src/OSSupport/File.cpp @@ -524,6 +524,13 @@ AStringVector cFile::GetFolderContents(const AString & a_Folder) { do { + if ( + (strcmp(FindFileData.cFileName, ".") == 0) || + (strcmp(FindFileData.cFileName, "..") == 0) + ) + { + continue; + } AllFiles.push_back(FindFileData.cFileName); } while (FindNextFileA(hFind, &FindFileData)); FindClose(hFind); @@ -546,6 +553,13 @@ AStringVector cFile::GetFolderContents(const AString & a_Folder) struct dirent *dirp; while ((dirp = readdir(dp)) != nullptr) { + if ( + (strcmp(dirp->d_name, ".") == 0) || + (strcmp(dirp->d_name, "..") == 0) + ) + { + continue; + } AllFiles.push_back(dirp->d_name); } closedir(dp); -- cgit v1.2.3