Merge pull request #8967 from drewnoakes/fix-8966

Fix invalid null value assertion in plugin code
gitextensions · Mar 11, 2021 · 9f05f5a · 9f05f5a
2 parents 7fbcff1 + ed46e69
commit 9f05f5a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Plugins/GitUIPluginInterfaces/ManagedExtensibility.cs b/Plugins/GitUIPluginInterfaces/ManagedExtensibility.cs
@@ -54,7 +54,6 @@ private static ExportProvider CreateExportProvider(string? applicationDataFolder
 
             string defaultPluginsPath = Path.Combine(new FileInfo(Application.ExecutablePath).Directory.FullName, "Plugins");
             string? userPluginsPath = UserPluginsPath;
-            Validates.NotNull(userPluginsPath);
 
             var pluginFiles = PluginsPathScanner.GetFiles(defaultPluginsPath, userPluginsPath);
 #if !CI_BUILD

diff --git a/Plugins/GitUIPluginInterfaces/PluginsPathScanner.cs b/Plugins/GitUIPluginInterfaces/PluginsPathScanner.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using GitExtUtils;
 
 namespace GitUIPluginInterfaces
 {
@@ -29,13 +30,13 @@ public static class PluginsPathScanner
         /// </example>
         /// <param name="pluginsPaths">An array of filesystem paths to search for plugins in.</param>
         /// <returns>An enumeration of found dll files.</returns>
-        public static IEnumerable<FileInfo> GetFiles(params string[] pluginsPaths)
+        public static IEnumerable<FileInfo> GetFiles(params string?[] pluginsPaths)
         {
             var result = Enumerable.Empty<FileInfo>();
 
-            foreach (string pluginsPath in pluginsPaths)
+            foreach (string? pluginsPath in pluginsPaths)
             {
-                if (!string.IsNullOrEmpty(pluginsPath) && Directory.Exists(pluginsPath))
+                if (!Strings.IsNullOrEmpty(pluginsPath) && Directory.Exists(pluginsPath))
                 {
                     DirectoryInfo directory = new(pluginsPath);