qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 13:25:05 +02:00
Code

Don't call tolower() on the whole filenames, only on extensions

Browse Source 
tolower() will trigger an assertion failure in the case where the
string contains UTF-8 codes. This is not a problem as only the
file extension needs to be processed, and that one should contain
only ASCII.
This commit is contained in:
Paul Cercueil 2013-07-05 14:00:46 -04:00
parent abc461bf95
commit eb63294231
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/filelister.cpp
View File

@ -83,14 +83,12 @@ void FileLister::browse(bool clean)
vector<string> vfilter; vector<string> vfilter;
split(vfilter, getFilter(), ","); split(vfilter, getFilter(), ",");
string filepath, file, file_lowercase; string filepath, file;
struct stat st; struct stat st;
struct dirent *dptr; struct dirent *dptr;
while ((dptr = readdir(dirp))) { while ((dptr = readdir(dirp))) {
file = dptr->d_name; file = dptr->d_name;
file_lowercase = file;
std::transform(file_lowercase.begin(), file_lowercase.end(), file_lowercase.begin(), ::tolower);
if (file[0] == '.' && file != "..") if (file[0] == '.' && file != "..")
continue; continue;
@ -120,8 +118,18 @@ void FileLister::browse(bool clean)
continue; continue;
for (vector<string>::iterator it = vfilter.begin(); it != vfilter.end(); ++it) { for (vector<string>::iterator it = vfilter.begin(); it != vfilter.end(); ++it) {
if (it->length() <= file.length()) { if (it->length() < file.length()) {
if (file_lowercase.compare(file.length() - it->length(), it->length(), *it) == 0) { string file_lowercase =
file.substr(file.length() - it->length());
if (file_lowercase[0] != '.')
continue;
/* XXX: This won't accept UTF-8 codes.
* Thanksfully file extensions shouldn't contain any. */
transform(file_lowercase.begin(), file_lowercase.end(),
file_lowercase.begin(), ::tolower);
if (file_lowercase.compare(0, it->length(), *it) == 0) {
files.push_back(file); files.push_back(file);
break; break;
} }