better handle ImageBitmapDecoder errors

Kamel-Media · Dec 7, 2023 · b6a1c94 · b6a1c94
1 parent 83248a4
commit b6a1c94
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/kamel-image/src/androidMain/kotlin/io/kamel/image/decoder/AndroidImageBitmapDecoder.kt b/kamel-image/src/androidMain/kotlin/io/kamel/image/decoder/AndroidImageBitmapDecoder.kt
@@ -1,6 +1,5 @@
 package io.kamel.image.decoder
 
-import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
@@ -18,7 +17,8 @@ internal actual object ImageBitmapDecoder : Decoder<ImageBitmap> {
 
     override suspend fun decode(channel: ByteReadChannel, resourceConfig: ResourceConfig): ImageBitmap {
         val bytes = channel.toByteArray()
-        val bitmap = BitmapFactory.decodeByteArray(bytes, Offset, bytes.size) as Bitmap
+        val bitmap = BitmapFactory.decodeByteArray(bytes, Offset, bytes.size)
+            ?: throw IllegalArgumentException("Failed to decode ${bytes.size} bytes to a bitmap. Decoded bytes:\n${bytes.decodeToString()}\n")
         return bitmap.asImageBitmap()
     }
 

diff --git a/kamel-image/src/desktopMain/kotlin/io/kamel/image/decoder/DesktopImageBitmapDecoder.kt b/kamel-image/src/desktopMain/kotlin/io/kamel/image/decoder/DesktopImageBitmapDecoder.kt
@@ -19,6 +19,13 @@ internal actual object ImageBitmapDecoder : Decoder<ImageBitmap> {
     override suspend fun decode(
         channel: ByteReadChannel,
         resourceConfig: ResourceConfig
-    ): ImageBitmap = Image.makeFromEncoded(channel.toByteArray()).toComposeImageBitmap()
+    ): ImageBitmap {
+        val bytes = channel.toByteArray()
+        return try {
+            Image.makeFromEncoded(bytes).toComposeImageBitmap()
+        } catch (t: Throwable) {
+            throw throw IllegalArgumentException("Failed to decode ${bytes.size} bytes to a bitmap. Decoded bytes:\n${bytes.decodeToString()}\n")
+        }
+    }
 
 }
diff --git a/kamel-image/src/nonJvmMain/kotlin/io/kamel/image/decoder/ImageBitmapDecoder.kt b/kamel-image/src/nonJvmMain/kotlin/io/kamel/image/decoder/ImageBitmapDecoder.kt
@@ -17,8 +17,14 @@ internal actual object ImageBitmapDecoder : Decoder<ImageBitmap> {
     override val outputKClass: KClass<ImageBitmap> = ImageBitmap::class
 
     override suspend fun decode(
-        channel: ByteReadChannel,
-        resourceConfig: ResourceConfig
-    ): ImageBitmap = Image.makeFromEncoded(channel.toByteArray()).toComposeImageBitmap()
+        channel: ByteReadChannel, resourceConfig: ResourceConfig
+    ): ImageBitmap {
+        val bytes = channel.toByteArray()
+        return try {
+            Image.makeFromEncoded(bytes).toComposeImageBitmap()
+        } catch (t: Throwable) {
+            throw throw IllegalArgumentException("Failed to decode ${bytes.size} bytes to a bitmap. Decoded bytes:\n${bytes.decodeToString()}\n")
+        }
+    }
 
 }