fix: add dir separator to base dir if missing

icsharpcode · May 8, 2021 · 4875a45 · 4875a45
1 parent 2e3e2e8
commit 4875a45
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/ICSharpCode.SharpZipLib/Zip/WindowsNameTransform.cs b/src/ICSharpCode.SharpZipLib/Zip/WindowsNameTransform.cs
@@ -134,7 +134,12 @@ public string TransformFile(string name)
 				{
 					name = Path.Combine(_baseDirectory, name);
 
-					var pathBase = Path.GetFullPath(_baseDirectory) + Path.DirectorySeparatorChar;
+					// Ensure base directory ends with directory separator ('/' or '\' depending on OS)
+					var pathBase = Path.GetFullPath(_baseDirectory);
+					if (pathBase[pathBase.Length - 1] != Path.DirectorySeparatorChar)
+					{
+						pathBase += Path.DirectorySeparatorChar;
+					}
 
 					if (!_allowParentTraversal && !Path.GetFullPath(name).StartsWith(pathBase, StringComparison.InvariantCultureIgnoreCase))
 					{