PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2024-12-23 05:17:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix NPE in DecryptExternal when reading lines

Browse source
This commit is contained in:
Paul Schaub 2024-09-19 20:00:30 +02:00
parent ed9fb31549
commit 61f3bf14c5
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external-sop/src/main/kotlin/sop/external/operation/DecryptExternal.kt vendored
View file

@ -108,8 +108,8 @@ class DecryptExternal(
finish(process) finish(process)
val sessionKeyOutIn = FileInputStream(sessionKeyOut) val sessionKeyOutIn = FileInputStream(sessionKeyOut)
var line = readString(sessionKeyOutIn) var line: String? = readString(sessionKeyOutIn)
val sessionKey = SessionKey.fromString(line.trim { it <= ' ' }) val sessionKey = line?.let { l -> SessionKey.fromString(l.trim { it <= ' ' }) }
sessionKeyOutIn.close() sessionKeyOutIn.close()
sessionKeyOut.delete() sessionKeyOut.delete()
@ -118,7 +118,7 @@ class DecryptExternal(
val verifyOutIn = FileInputStream(verifyOut) val verifyOutIn = FileInputStream(verifyOut)
val reader = BufferedReader(InputStreamReader(verifyOutIn)) val reader = BufferedReader(InputStreamReader(verifyOutIn))
while (reader.readLine().also { line = it } != null) { while (reader.readLine().also { line = it } != null) {
verifications.add(Verification.fromString(line.trim())) line?.let { verifications.add(Verification.fromString(it.trim())) }
} }
reader.close() reader.close()
} }