Merge pull request #728 from dotnet/fixNRE

AArnott · web-flow · commit ba46f06d0afd · 2022-03-14T17:47:58.000-06:00
Fix NullReferenceException thrown when PATH is empty/missing
diff --git a/src/Nerdbank.GitVersioning.Tasks/ContextAwareTask.cs b/src/Nerdbank.GitVersioning.Tasks/ContextAwareTask.cs
@@ -56,7 +56,7 @@ where outerProperty.SetMethod is not null && outerProperty.GetMethod is not null
             // On .NET Framework (on Windows), we find native binaries by adding them to our PATH.
             if (this.UnmanagedDllDirectory is not null)
             {
-                string pathEnvVar = Environment.GetEnvironmentVariable("PATH");
+                string pathEnvVar = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
                 string[] searchPaths = pathEnvVar.Split(Path.PathSeparator);
                 if (!searchPaths.Contains(this.UnmanagedDllDirectory, StringComparer.OrdinalIgnoreCase))
                 {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ where outerProperty.SetMethod is not null && outerProperty.GetMethod is not null`
`56`	`56`	`// On .NET Framework (on Windows), we find native binaries by adding them to our PATH.`
`57`	`57`	`if (this.UnmanagedDllDirectory is not null)`
`58`	`58`	`{`
`59`		`- string pathEnvVar = Environment.GetEnvironmentVariable("PATH");`
	`59`	`+ string pathEnvVar = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;`
`60`	`60`	`string[] searchPaths = pathEnvVar.Split(Path.PathSeparator);`
`61`	`61`	`if (!searchPaths.Contains(this.UnmanagedDllDirectory, StringComparer.OrdinalIgnoreCase))`
`62`	`62`	`{`