From a02eb169f4efdd5f601b13ceaa7f5ff1f2a22e0e Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 27 Mar 2021 18:10:49 +0000 Subject: [PATCH] Fix NPE in TextKeyReader if the input is invalid Signed-off-by: Graham --- .../main/kotlin/org/openrs2/archive/key/TextKeyReader.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/archive/src/main/kotlin/org/openrs2/archive/key/TextKeyReader.kt b/archive/src/main/kotlin/org/openrs2/archive/key/TextKeyReader.kt index cc453b34..7ef3ac58 100644 --- a/archive/src/main/kotlin/org/openrs2/archive/key/TextKeyReader.kt +++ b/archive/src/main/kotlin/org/openrs2/archive/key/TextKeyReader.kt @@ -7,10 +7,10 @@ public object TextKeyReader : KeyReader { override fun read(input: InputStream): Sequence { val reader = input.bufferedReader() - val k0 = reader.readLine().toIntOrNull() ?: return emptySequence() - val k1 = reader.readLine().toIntOrNull() ?: return emptySequence() - val k2 = reader.readLine().toIntOrNull() ?: return emptySequence() - val k3 = reader.readLine().toIntOrNull() ?: return emptySequence() + val k0 = reader.readLine()?.toIntOrNull() ?: return emptySequence() + val k1 = reader.readLine()?.toIntOrNull() ?: return emptySequence() + val k2 = reader.readLine()?.toIntOrNull() ?: return emptySequence() + val k3 = reader.readLine()?.toIntOrNull() ?: return emptySequence() return sequenceOf(XteaKey(k0, k1, k2, k3)) }