Fix #3038 (Hash validation crash) (#3142)

CCBlueX · May 27, 2024 · 84e403f · 84e403f
1 parent f9662a0
commit 84e403f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/validation/HashValidator.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/validation/HashValidator.kt
@@ -33,14 +33,20 @@ object HashValidator {
     }
 
     private fun validateHashFile(hashFile: File) {
-        val hashes: (FileInputStream) -> Map<String, String> = {
+        val hashExtractor: (FileInputStream) -> Map<String, String> = {
             Gson().fromJson(
                 InputStreamReader(it),
                 object : TypeToken<Map<String, String>>() {}.type
             )
         }
 
-        val delete = shouldDelete(hashFile, FileInputStream(hashFile).use(hashes))
+        val delete = runCatching {
+            val hashes = FileInputStream(hashFile).use(hashExtractor)
+
+            shouldDelete(hashFile, hashes)
+        }.onFailure {
+            logger.warn("Invalid hash file ${hashFile.absolutePath}", it)
+        }.getOrDefault(true)
 
         if (delete) {
             val folderToDelete = hashFile.parentFile