TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-05-18 21:18:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always close outputStream in processFile

Browse Source 
Fix #8735
This commit is contained in:
topjohnwu 2025-03-19 17:57:31 -07:00
parent aa35aac5d5
commit f56fd4e215
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/core/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
View File

@ -17,7 +17,6 @@ import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.di.ServiceLocator import com.topjohnwu.magisk.core.di.ServiceLocator
import com.topjohnwu.magisk.core.isRunningAsStub import com.topjohnwu.magisk.core.isRunningAsStub
import com.topjohnwu.magisk.core.ktx.copyAll import com.topjohnwu.magisk.core.ktx.copyAll
import com.topjohnwu.magisk.core.ktx.copyAndClose
import com.topjohnwu.magisk.core.ktx.writeTo import com.topjohnwu.magisk.core.ktx.writeTo
import com.topjohnwu.magisk.core.utils.DummyList import com.topjohnwu.magisk.core.utils.DummyList
import com.topjohnwu.magisk.core.utils.MediaStoreUtils import com.topjohnwu.magisk.core.utils.MediaStoreUtils
@ -500,7 +499,7 @@ abstract class MagiskInstallImpl protected constructor(
bootItem.file = newBoot bootItem.file = newBoot
bootItem.copyTo(outStream as TarArchiveOutputStream) bootItem.copyTo(outStream as TarArchiveOutputStream)
} else { } else {
newBoot.newInputStream().copyAndClose(outStream) newBoot.newInputStream().use { it.copyAll(outStream) }
} }
newBoot.delete() newBoot.delete()
@ -514,6 +513,8 @@ abstract class MagiskInstallImpl protected constructor(
outFile.delete() outFile.delete()
Timber.e(e) Timber.e(e)
return false return false
} finally {
outStream.close()
} }
// Fix up binaries // Fix up binaries