fix: clean up directory separators before path combine

jeremybeier · jeremybeier · commit a88324a3df7a · 2021-04-22T13:57:42.000+02:00
diff --git a/src/ReportGenerator.Core/Parser/Preprocessing/CoberturaReportPreprocessor.cs b/src/ReportGenerator.Core/Parser/Preprocessing/CoberturaReportPreprocessor.cs
@@ -71,9 +71,9 @@ internal void Execute(XContainer report)
                         continue;
                     }
 
-                    string path = Path.Combine(sources[0], fileNameAttribute.Value)
-                        .Replace('\\', Path.DirectorySeparatorChar)
-                        .Replace('/', Path.DirectorySeparatorChar);
+                    string sourcePath = sources[0].Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);
+                    string fileName = fileNameAttribute.Value.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);
+                    string path = Path.Combine(sourcePath, fileName);
                     fileNameAttribute.Value = path;
                 }
             }
@@ -90,9 +90,9 @@ internal void Execute(XContainer report)
 
                     foreach (var source in sources)
                     {
-                        string path = Path.Combine(source, fileNameAttribute.Value)
-                            .Replace('\\', Path.DirectorySeparatorChar)
-                            .Replace('/', Path.DirectorySeparatorChar);
+                        string sourcePath = source.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);
+                        string fileName = fileNameAttribute.Value.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);
+                        string path = Path.Combine(sourcePath, fileName);
 
                         if (File.Exists(path))
                         {

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ internal void Execute(XContainer report)`
`71`	`71`	`continue;`
`72`	`72`	`}`
`73`	`73`
`74`		`- string path = Path.Combine(sources[0], fileNameAttribute.Value)`
`75`		`- .Replace('\\', Path.DirectorySeparatorChar)`
`76`		`- .Replace('/', Path.DirectorySeparatorChar);`
	`74`	`+ string sourcePath = sources[0].Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);`
	`75`	`+ string fileName = fileNameAttribute.Value.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);`
	`76`	`+ string path = Path.Combine(sourcePath, fileName);`
`77`	`77`	`fileNameAttribute.Value = path;`
`78`	`78`	`}`
`79`	`79`	`}`
`@@ -90,9 +90,9 @@ internal void Execute(XContainer report)`
`90`	`90`
`91`	`91`	`foreach (var source in sources)`
`92`	`92`	`{`
`93`		`- string path = Path.Combine(source, fileNameAttribute.Value)`
`94`		`- .Replace('\\', Path.DirectorySeparatorChar)`
`95`		`- .Replace('/', Path.DirectorySeparatorChar);`
	`93`	`+ string sourcePath = source.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);`
	`94`	`+ string fileName = fileNameAttribute.Value.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);`
	`95`	`+ string path = Path.Combine(sourcePath, fileName);`
`96`	`96`
`97`	`97`	`if (File.Exists(path))`
`98`	`98`	`{`