brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle IOException in readUnexpectedStderr

Browse Source
This commit is contained in:
Mygod
2021-05-25 13:38:54 -04:00
parent 160175b946
commit d9f67661d3
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt
View File

@@ -107,12 +107,16 @@ class RootServer {
if (!this::process.isInitialized) return null if (!this::process.isInitialized) return null
var available = process.errorStream.available() var available = process.errorStream.available()
return if (available <= 0) null else String(ByteArrayOutputStream().apply { return if (available <= 0) null else String(ByteArrayOutputStream().apply {
while (available > 0) { try {
val bytes = ByteArray(available) while (available > 0) {
val len = process.errorStream.read(bytes) val bytes = ByteArray(available)
if (len < 0) throw EOFException() // should not happen val len = process.errorStream.read(bytes)
write(bytes, 0, len) if (len < 0) throw EOFException() // should not happen
available = process.errorStream.available() write(bytes, 0, len)
available = process.errorStream.available()
}
} catch (e: IOException) {
Logger.me.w("Reading stderr was cut short", e)
} }
}.toByteArray()) }.toByteArray())
} }