Make Public Suffix Database failures permanent (#7828)

square · Sep 15, 2023 · 708d89b · 708d89b
1 parent b147d28
commit 708d89b
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/okhttp/src/main/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt b/okhttp/src/main/kotlin/okhttp3/internal/publicsuffix/PublicSuffixDatabase.kt
@@ -203,26 +203,28 @@ class PublicSuffixDatabase {
 
   @Throws(IOException::class)
   private fun readTheList() {
-    var publicSuffixListBytes: ByteArray?
-    var publicSuffixExceptionListBytes: ByteArray?
+    try {
+      var publicSuffixListBytes: ByteArray?
+      var publicSuffixExceptionListBytes: ByteArray?
 
-    val resource =
+      val resource =
         PublicSuffixDatabase::class.java.getResourceAsStream(PUBLIC_SUFFIX_RESOURCE) ?: return
 
-    GzipSource(resource.source()).buffer().use { bufferedSource ->
-      val totalBytes = bufferedSource.readInt()
-      publicSuffixListBytes = bufferedSource.readByteArray(totalBytes.toLong())
+      GzipSource(resource.source()).buffer().use { bufferedSource ->
+        val totalBytes = bufferedSource.readInt()
+        publicSuffixListBytes = bufferedSource.readByteArray(totalBytes.toLong())
 
-      val totalExceptionBytes = bufferedSource.readInt()
-      publicSuffixExceptionListBytes = bufferedSource.readByteArray(totalExceptionBytes.toLong())
-    }
+        val totalExceptionBytes = bufferedSource.readInt()
+        publicSuffixExceptionListBytes = bufferedSource.readByteArray(totalExceptionBytes.toLong())
+      }
 
-    synchronized(this) {
-      this.publicSuffixListBytes = publicSuffixListBytes!!
-      this.publicSuffixExceptionListBytes = publicSuffixExceptionListBytes!!
+      synchronized(this) {
+        this.publicSuffixListBytes = publicSuffixListBytes!!
+        this.publicSuffixExceptionListBytes = publicSuffixExceptionListBytes!!
+      }
+    } finally {
+      readCompleteLatch.countDown()
     }
-
-    readCompleteLatch.countDown()
   }
 
   /** Visible for testing. */