VERY experimental Nintendo Switch 2 emulator
C++
android: Fix potential zip traversal exploit
Charles Lombardo932a6f42a2a7
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.ktindex 236c7bc236..23986692aa 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/GpuDriverHelper.kt@@ -7,6 +7,7 @@ import android.content.Contextimport android.net.Uriimport org.yuzu.yuzu_emu.NativeLibraryimport org.yuzu.yuzu_emu.utils.FileUtil.copyUriToInternalStorage+import java.io.BufferedInputStreamimport java.io.Fileimport java.io.FileInputStreamimport java.io.FileOutputStream@@ -28,12 +29,17 @@ object GpuDriverHelper {if (!dir.exists()) dir.mkdirs()// Unpack the files.- val zis = ZipInputStream(FileInputStream(zipFilePath))+ val inputStream = FileInputStream(zipFilePath)+ val zis = ZipInputStream(BufferedInputStream(inputStream))val buffer = ByteArray(1024)var ze = zis.nextEntrywhile (ze != null) {- val fileName = ze.name- val newFile = File(destDir + fileName)+ val newFile = File(destDir, ze.name)+ val canonicalPath = newFile.canonicalPath+ if (!canonicalPath.startsWith(destDir + ze.name)) {+ throw SecurityException("Zip file attempted path traversal! " + ze.name)+ }+newFile.parentFile!!.mkdirs()val fos = FileOutputStream(newFile)var len: Int