Remove call to Path.GetInvalidFileNameChars

Superseded by a static char list to avoid platform-dependent issues
This commit is contained in:
Ronan Charles-Lorel 2023-06-29 15:21:39 +02:00 committed by GitHub
parent e108183b13
commit 46763b7661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -275,9 +275,14 @@ namespace Emby.Server.Implementations.IO
/// <exception cref="ArgumentNullException">The filename is null.</exception> /// <exception cref="ArgumentNullException">The filename is null.</exception>
public string GetValidFilename(string filename) public string GetValidFilename(string filename)
{ {
// necessary because (as per the doc) GetInvalidFileNameChars is not exhaustive and may not return all invalid chars, which creates issues // using a character list instead of GetInvalidFileNameChars, as it is not exhaustive and may not return all invalid chars
char[] genericInvalidChars = { ':' }; char[] invalid = {
var invalid = Path.GetInvalidFileNameChars().Concat(genericInvalidChars).ToArray(); '\"', '<', '>', '|', '\0',
(char)1, (char)2, (char)3, (char)4, (char)5, (char)6, (char)7, (char)8, (char)9, (char)10,
(char)11, (char)12, (char)13, (char)14, (char)15, (char)16, (char)17, (char)18, (char)19, (char)20,
(char)21, (char)22, (char)23, (char)24, (char)25, (char)26, (char)27, (char)28, (char)29, (char)30,
(char)31, ':', '*', '?', '\\', '/'
};
var first = filename.IndexOfAny(invalid); var first = filename.IndexOfAny(invalid);
if (first == -1) if (first == -1)
{ {