Fix report file writing when ISO Disc Label contains non-safe characters

UniqProject · Jan 21, 2023 · a571337 · a571337
1 parent fe2cacc
commit a571337
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/BDInfo/FormReport.cs b/BDInfo/FormReport.cs
@@ -47,6 +47,8 @@ public void Generate(
                 string reportName = string.Format(  CultureInfo.InvariantCulture,
                                                     "BDINFO.{0}.txt",
                                                     BDROM.VolumeLabel);
+
+                reportName = ToolBox.GetSafeFileName(reportName);
 
                 reportFile = File.CreateText(Path.Combine(Environment.CurrentDirectory, reportName));
             }

diff --git a/BDInfo/ToolBox.cs b/BDInfo/ToolBox.cs
@@ -49,5 +49,21 @@ public static string ReadString(
 
             return val;
         }
+
+        public static string GetSafeFileName(string fileName)
+        {
+            string outFileName = fileName;
+
+            foreach (char lDisallowed in System.IO.Path.GetInvalidFileNameChars())
+            {
+                outFileName = outFileName.Replace(lDisallowed.ToString(), "");
+            }
+            foreach (char lDisallowed in System.IO.Path.GetInvalidPathChars())
+            {
+                outFileName = outFileName.Replace(lDisallowed.ToString(), "");
+            }
+
+            return outFileName;
+        }
     }
 }