From d45b1ea9a754b178acd2a95705802868b8fbc8dc Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Sat, 31 May 2025 03:47:10 +0200 Subject: [PATCH] QrCodeFromFileScanner: catch OOM errors OutOfMemoryError is an Error which is a Throwable, but it isn't an exception. Try to catch it for downscaling by catching all Throwables. Signed-off-by: Jason A. Donenfeld --- .../java/com/wireguard/android/util/QrCodeFromFileScanner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt index 6388ed6b..8ffd6bb4 100644 --- a/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt +++ b/ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt @@ -80,7 +80,7 @@ class QrCodeFromFileScanner( scanBitmapForResult(originalBitmap).also { Log.d(TAG, "Found result in original image") } - } catch (e: Exception) { + } catch (e: Throwable) { Log.e(TAG, "Original image scan finished with error: $e, will try downscaled image") val scaleBitmap = downscaleBitmap(originalBitmap, 500) scanBitmapForResult(originalBitmap).also { scaleBitmap.recycle() }