Bladeren bron

Avoid crash when loading invalid extension package

(cherry picked from commit 3d7c136320da3b5842a51d7dbb9e82cf74144f3f)
arkon 2 jaren geleden
bovenliggende
commit
6f2bb18d72
1 gewijzigde bestanden met toevoegingen van 2 en 3 verwijderingen
  1. 2 3
      app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

+ 2 - 3
app/src/main/java/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt

@@ -126,8 +126,8 @@ internal object ExtensionLoader {
         }
 
         // Validate lib version
-        val libVersion = versionName.substringBeforeLast('.').toDouble()
-        if (libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
+        val libVersion = versionName.substringBeforeLast('.').toDoubleOrNull()
+        if (libVersion == null || libVersion < LIB_VERSION_MIN || libVersion > LIB_VERSION_MAX) {
             logcat(LogPriority.WARN) {
                 "Lib version is $libVersion, while only versions " +
                     "$LIB_VERSION_MIN to $LIB_VERSION_MAX are allowed"
@@ -136,7 +136,6 @@ internal object ExtensionLoader {
         }
 
         val signatureHash = getSignatureHash(pkgInfo)
-
         if (signatureHash == null) {
             logcat(LogPriority.WARN) { "Package $pkgName isn't signed" }
             return LoadResult.Error