liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-2997] Improve file name filtering #2047

Browse Source 
Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
Georgii Surkov 2022-11-28 22:28:51 +03:00 committed by GitHub
parent 84f9af3e7e
commit c535ce9b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/toolbox/path.c
View File

@ -95,23 +95,18 @@ bool path_contains_only_ascii(const char* path) {
name_pos++; name_pos++;
} }
while(*name_pos != '\0') { for(; *name_pos; ++name_pos) {
if((*name_pos >= '0') && (*name_pos <= '9')) { const char c = *name_pos;
name_pos++;
continue;
} else if((*name_pos >= 'A') && (*name_pos <= 'Z')) {
name_pos++;
continue;
} else if((*name_pos >= 'a') && (*name_pos <= 'z')) {
name_pos++;
continue;
} else if(strchr(" .!#\\$%&'()-@^_`{}~", *name_pos) != NULL) {
name_pos++;
continue;
}
// Regular ASCII characters from 0x20 to 0x7e
const bool is_out_of_range = (c < ' ') || (c > '~');
// Cross-platform forbidden character set
const bool is_forbidden = strchr("\\<>*|\":?", c);
if(is_out_of_range || is_forbidden) {
return false; return false;
} }
}
return true; return true;
} }