Skip to content

Commit d45b1ea

Browse files
committed
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 <[email protected]>
1 parent f9764e9 commit d45b1ea

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ui/src/main/java/com/wireguard/android/util/QrCodeFromFileScanner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class QrCodeFromFileScanner(
8080
scanBitmapForResult(originalBitmap).also {
8181
Log.d(TAG, "Found result in original image")
8282
}
83-
} catch (e: Exception) {
83+
} catch (e: Throwable) {
8484
Log.e(TAG, "Original image scan finished with error: $e, will try downscaled image")
8585
val scaleBitmap = downscaleBitmap(originalBitmap, 500)
8686
scanBitmapForResult(originalBitmap).also { scaleBitmap.recycle() }

0 commit comments

Comments
 (0)