[BWA-10] Handle exception when checking for suspicious intents (#228)

This commit is contained in:
Patrick Honkonen
2024-10-08 09:20:44 -04:00
committed by GitHub
parent 3aaa93675d
commit d8c80f7e28

View File

@@ -7,7 +7,13 @@ import android.content.Intent
*/
val Intent.isSuspicious: Boolean
get() {
val containsSuspiciousExtras = extras?.isEmpty?.not() ?: false
val containsSuspiciousData = data != null
return containsSuspiciousData || containsSuspiciousExtras
return try {
val containsSuspiciousExtras = extras?.isEmpty() == false
val containsSuspiciousData = data != null
containsSuspiciousData || containsSuspiciousExtras
} catch (_: Exception) {
// `unparcel()` throws an exception on Android 12 and below if the bundle contains
// suspicious data, so we catch the exception and return true.
true
}
}