Bug 1884300 - Add NullPointerException for SvgIconDecoder

mozilla-mobile · Mar 8, 2024 · e8c1dac · e8c1dac
1 parent 8d184f3
commit e8c1dac
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...ts/browser/icons/src/main/java/mozilla/components/browser/icons/decoder/SvgIconDecoder.kt b/...ts/browser/icons/src/main/java/mozilla/components/browser/icons/decoder/SvgIconDecoder.kt
@@ -25,6 +25,7 @@ import mozilla.components.support.images.decoder.ImageDecoder
 class SvgIconDecoder(val context: Context) : ImageDecoder {
     private val logger = Logger("SvgIconDecoder")
 
+    @Suppress("TooGenericExceptionCaught")
     override fun decode(data: ByteArray, desiredSize: DesiredSize): Bitmap? =
         try {
             val svg = SVG.getFromInputStream(data.inputStream())
@@ -65,6 +66,9 @@ class SvgIconDecoder(val context: Context) : ImageDecoder {
             svg.renderToCanvas(Canvas(bitmap))
 
             bitmap
+        } catch (e: NullPointerException) {
+            logger.error("Failed to decode SVG: " + e.message.toString())
+            null
         } catch (e: IllegalArgumentException) {
             logger.error("Failed to decode SVG: " + e.message.toString())
             null