Handle another failure path

Avoid crash when BitmapFactory cannot decode image
termux · Oct 10, 2024 · d1da723 · d1da723
1 parent f94824a
commit d1da723
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/terminal-emulator/src/main/java/com/termux/terminal/TerminalBitmap.java b/terminal-emulator/src/main/java/com/termux/terminal/TerminalBitmap.java
@@ -77,6 +77,13 @@ public TerminalBitmap(int num, byte[] image, int Y, int X, int cellW, int cellH,
                 bm = BitmapFactory.decodeByteArray(image, 0, image.length, scaleOptions);
             } catch (Exception e) {
                 Logger.logWarn(null, LOG_TAG, "Out of memory, cannot decode image");
+                bitmap = null;
+                return;
+            }
+            if (bm == null) {
+                Logger.logWarn(null, LOG_TAG, "Could not decode image");
+                bitmap = null;
+                return;
             }
             int maxWidth = (screen.mColumns - X) * cellW;
             if (newWidth > maxWidth) {