[BUG] Fix ArgumentException: Illegal characters in path (#171), versi…

…on 1.0.17.43
Hofknecht · May 20, 2021 · 027e514 · 027e514
1 parent a972ae3
commit 027e514
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Business/Menus.cs b/Business/Menus.cs
@@ -283,7 +283,11 @@ internal static MenuData GetData(BackgroundWorker worker, string path, int level
 
                 try
                 {
-                    if (FileLnk.IsNetworkRoot(path))
+                    if (string.IsNullOrEmpty(path))
+                    {
+                        Log.Info($"path is null or empty");
+                    }
+                    else if (FileLnk.IsNetworkRoot(path))
                     {
                         directories = GetDirectoriesInNetworkLocation(path);
                         static string[] GetDirectoriesInNetworkLocation(string networkLocationRootPath)
@@ -352,13 +356,16 @@ static string[] GetDirectoriesInNetworkLocation(string networkLocationRootPath)
                     Log.Warn($"path:'{path}'", ex);
                 }
 
-                foreach (string directory in directories)
+                foreach (string directoryWithIllegalCharacters in directories)
                 {
                     if (worker != null && worker.CancellationPending)
                     {
                         break;
                     }
 
+                    // https://github.com/Hofknecht/SystemTrayMenu/issues/171
+                    string directory = directoryWithIllegalCharacters.Replace("\x00", string.Empty);
+
                     bool hiddenEntry = false;
                     if (FolderOptions.IsHidden(directory, ref hiddenEntry))
                     {
@@ -381,7 +388,11 @@ static string[] GetDirectoriesInNetworkLocation(string networkLocationRootPath)
 
                 try
                 {
-                    if (!FileLnk.IsNetworkRoot(path))
+                    if (string.IsNullOrEmpty(path))
+                    {
+                        Log.Info($"path is null or empty");
+                    }
+                    else if (!FileLnk.IsNetworkRoot(path))
                     {
                         files = Directory.GetFiles(path);
                     }

diff --git a/Utilities/Log.cs b/Utilities/Log.cs
@@ -107,7 +107,8 @@ internal static void ProcessStart(
             catch (Exception ex)
             {
                 if (ex is FileNotFoundException ||
-                    ex is Win32Exception)
+                    ex is Win32Exception ||
+                    ex is InvalidOperationException)
                 {
                     Warn($"fileName:'{fileName}' arguments:'{arguments}'", ex);
                     MessageBox.Show(ex.Message);