From 14fa226eccb36dc0224cbc0893b6c37909369bfb Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 16 Sep 2019 12:36:28 -0700 Subject: [PATCH] Fixes Zip Slip fix break when using ArchiveFileStreamContext to compress Fixes wixtoolset/issues#6075 --- src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs b/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs index 35832a575..b17d3f2a8 100644 --- a/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs +++ b/src/DTF/Libraries/Compression/ArchiveFileStreamContext.cs @@ -633,13 +633,13 @@ private string TranslateFilePath(string path) } else { + this.ValidateArchivePath(path); + filePath = path; } if (filePath != null) { - this.ValidateArchivePath(filePath); - if (this.directory != null) { filePath = Path.Combine(this.directory, filePath);