Better Zip Extraction pt.2

burst-apps-team · Jul 14, 2019 · 57bcc75 · 57bcc75
1 parent 9800d63
commit 57bcc75
Showing 1 changed file with 15 additions and 0 deletions.
diff --git a/QBundle/frmDownloadManager.vb b/QBundle/frmDownloadManager.vb
@@ -172,6 +172,21 @@ Public Class frmDownloadManager
         Try
             Dim filename As String = QGlobal.AppDir & Path.GetFileName(Url)
             Dim target As String = QGlobal.AppDir
+            Using archive As ZipArchive = ZipFile.OpenRead(filename)
+                For Each entry As ZipArchiveEntry In archive.Entries
+                    If Not entry.FullName.EndsWith("/") Then
+                        Dim destFileName = Path.Combine(target, entry.FullName)
+                        Dim fullDestDirPath = Path.GetFullPath(target + Path.DirectorySeparatorChar)
+                        If Not destFileName.StartsWith(fullDestDirPath) Then
+                            Throw New Exception("Entry is outside of target dir: " + destFileName)
+                        End If
+                        Try
+                            My.Computer.FileSystem.DeleteFile(destFileName)
+                        Catch ex As FileNotFoundException
+                        End Try
+                    End If
+                Next 
+            End Using
             ZipFile.ExtractToDirectory(filename, target)
             AllOk = True
         Catch ex As Exception