tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow illegal chars in templates

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2022-06-23 16:36:56 -06:00
parent 7e00162ef2
commit bc9625fece
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/LibationFileManager/Templates.cs
View File

@ -54,10 +54,7 @@ namespace LibationFileManager
if (template is null) if (template is null)
return new[] { ERROR_NULL_IS_INVALID }; return new[] { ERROR_NULL_IS_INVALID };
if (template.Contains(':') if (ReplacementCharacters.ContainsInvalid(template.Replace("<","").Replace(">","")))
|| template.Contains(Path.DirectorySeparatorChar)
|| template.Contains(Path.AltDirectorySeparatorChar)
)
return new[] { ERROR_INVALID_FILE_NAME_CHAR }; return new[] { ERROR_INVALID_FILE_NAME_CHAR };
return Valid; return Valid;
@ -200,6 +197,10 @@ namespace LibationFileManager
if (template.Contains(':')) if (template.Contains(':'))
return new[] { ERROR_FULL_PATH_IS_INVALID }; return new[] { ERROR_FULL_PATH_IS_INVALID };
// must be relative. no colons. all other path chars are valid enough to pass this check and will be handled on final save.
if (ReplacementCharacters.ContainsInvalid(template.Replace("<", "").Replace(">", "")))
return new[] { ERROR_INVALID_FILE_NAME_CHAR };
return Valid; return Valid;
} }