From 5269a463999be77bedff2c8c3e4cf0ceedc6f631 Mon Sep 17 00:00:00 2001 From: Charles Lombardo Date: Fri, 22 Sep 2023 16:51:48 -0400 Subject: [PATCH] android: Use smaller read buffer size for exporting user data The File.readBytes() extension attempts to load an entire file into a byte array. This would cause crashes when loading huge files into memory. --- .../java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt index 54993a958..6fa847631 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/ui/main/MainActivity.kt @@ -50,6 +50,7 @@ import org.yuzu.yuzu_emu.model.TaskViewModel import org.yuzu.yuzu_emu.utils.* import java.io.BufferedInputStream import java.io.BufferedOutputStream +import java.io.FileInputStream import java.io.FileOutputStream import java.util.zip.ZipEntry import java.util.zip.ZipInputStream @@ -639,7 +640,15 @@ class MainActivity : AppCompatActivity(), ThemeProvider { file.path.length ) stream.putNextEntry(ZipEntry(newPath)) - stream.write(file.readBytes()) + + val buffer = ByteArray(8096) + var read: Int + FileInputStream(file).use { fis -> + while (fis.read(buffer).also { read = it } != -1) { + stream.write(buffer, 0, read) + } + } + stream.closeEntry() } }