Merge pull request #21060 from wordpress-mobile/issue/21040-android14…

…-zip-traversal Catch ZipException when inflating
wordpress-mobile · Jul 16, 2024 · ba705b7 · ba705b7
2 parents 216fc90 + 8d89a13
commit ba705b7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/models/Note.kt b/WordPress/src/main/java/org/wordpress/android/models/Note.kt
@@ -26,6 +26,7 @@ import java.util.Date
 import java.util.EnumSet
 import java.util.zip.DataFormatException
 import java.util.zip.Inflater
+import java.util.zip.ZipException
 
 class Note {
     val id: String
@@ -417,6 +418,9 @@ class Note {
             } catch (e: DataFormatException) {
                 AppLog.e(AppLog.T.NOTIFS, "Can't decompress the PN BlockListPayload. It could be > 4K", e)
                 0
+            } catch (e: ZipException) {
+                AppLog.e(AppLog.T.NOTIFS, "Can't decompress the PN BlockListPayload.", e)
+                0
             }
             val out: String? = try {
                 String(result, 0, resultLength, charset("UTF8"))