Merge pull request libgit2#1741 from qmfrederik/fixes/resolve-dll-no-throw

bording · web-flow · commit 58410d5c87e7 · 2019-11-20T16:33:18.000-05:00
NativeMethods.ResolveDll: Avoid exceptions
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -156,12 +156,17 @@ private static IntPtr ResolveDll(string libraryName, Assembly assembly, DllImpor
                     // The <rid> ends with the processor architecture. e.g. fedora-x64.
                     string assemblyDirectory = Path.GetDirectoryName(typeof(NativeMethods).Assembly.Location);
                     string processorArchitecture = RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();
-                    foreach (var runtimeFolder in Directory.GetDirectories(Path.Combine(assemblyDirectory, "runtimes"), $"*-{processorArchitecture}"))
+                    string runtimesDirectory = Path.Combine(assemblyDirectory, "runtimes");
+
+                    if (Directory.Exists(runtimesDirectory))
                     {
-                        string libPath = Path.Combine(runtimeFolder, "native", $"lib{libraryName}.so");
-                        if (TryLoadLibrary(libPath, out handle))
+                        foreach (var runtimeFolder in Directory.GetDirectories(runtimesDirectory, $"*-{processorArchitecture}"))
                         {
-                            return handle;
+                            string libPath = Path.Combine(runtimeFolder, "native", $"lib{libraryName}.so");
+                            if (TryLoadLibrary(libPath, out handle))
+                            {
+                                return handle;
+                            }
                         }
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -156,12 +156,17 @@ private static IntPtr ResolveDll(string libraryName, Assembly assembly, DllImpor`
`156`	`156`	`// The <rid> ends with the processor architecture. e.g. fedora-x64.`
`157`	`157`	`string assemblyDirectory = Path.GetDirectoryName(typeof(NativeMethods).Assembly.Location);`
`158`	`158`	`string processorArchitecture = RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant();`
`159`		`- foreach (var runtimeFolder in Directory.GetDirectories(Path.Combine(assemblyDirectory, "runtimes"), $"*-{processorArchitecture}"))`
	`159`	`+ string runtimesDirectory = Path.Combine(assemblyDirectory, "runtimes");`
	`160`	`+`
	`161`	`+ if (Directory.Exists(runtimesDirectory))`
`160`	`162`	`{`
`161`		`- string libPath = Path.Combine(runtimeFolder, "native", $"lib{libraryName}.so");`
`162`		`- if (TryLoadLibrary(libPath, out handle))`
	`163`	`+ foreach (var runtimeFolder in Directory.GetDirectories(runtimesDirectory, $"*-{processorArchitecture}"))`
`163`	`164`	`{`
`164`		`- return handle;`
	`165`	`+ string libPath = Path.Combine(runtimeFolder, "native", $"lib{libraryName}.so");`
	`166`	`+ if (TryLoadLibrary(libPath, out handle))`
	`167`	`+ {`
	`168`	`+ return handle;`
	`169`	`+ }`
`165`	`170`	`}`
`166`	`171`	`}`
`167`	`172`	`}`