C#: Fix always-null bug in TRAP writer

hvitved · hvitved · commit e05bbb0f106f · 2018-12-07T15:46:27.000+01:00
diff --git a/csharp/extractor/Semmle.Extraction/TrapWriter.cs b/csharp/extractor/Semmle.Extraction/TrapWriter.cs
@@ -285,7 +285,7 @@ private void ArchiveContents(string fullInputPath, string contents)
         public static string NestPaths(ILogger logger, string outerpath, string innerpath, InnerPathComputation innerPathComputation)
         {
             string nested = innerpath;
-            if (outerpath != null || outerpath.Length != 0)
+            if (!string.IsNullOrEmpty(outerpath))
             {
                 if (!Path.IsPathRooted(innerpath) && innerPathComputation == InnerPathComputation.ABSOLUTE)
                     innerpath = Path.GetFullPath(innerpath);

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ private void ArchiveContents(string fullInputPath, string contents)`
`285`	`285`	`public static string NestPaths(ILogger logger, string outerpath, string innerpath, InnerPathComputation innerPathComputation)`
`286`	`286`	`{`
`287`	`287`	`string nested = innerpath;`
`288`		`- if (outerpath != null \|\| outerpath.Length != 0)`
	`288`	`+ if (!string.IsNullOrEmpty(outerpath))`
`289`	`289`	`{`
`290`	`290`	`if (!Path.IsPathRooted(innerpath) && innerPathComputation == InnerPathComputation.ABSOLUTE)`
`291`	`291`	`innerpath = Path.GetFullPath(innerpath);`