From 4461ebf6620ea41ef9b117e301f7a1ae62735271 Mon Sep 17 00:00:00 2001
From: Benedikt Constantin Radtke <benediktradtke@mailbox.tu-berlin.de>
Date: Sat, 21 Jan 2017 21:08:13 +0100
Subject: [PATCH] check if image decoding succeeded before using the result

Fixes #6061
Closes #6080
// FREEBIE
---
 src/org/thoughtcrime/securesms/util/BitmapUtil.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
index 8a35ca0972..bf13ad851d 100644
--- a/src/org/thoughtcrime/securesms/util/BitmapUtil.java
+++ b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
@@ -59,6 +59,10 @@ public class BitmapUtil {
                                                       constraints.getImageMaxHeight(context),
                                                       DecodeFormat.PREFER_RGB_565);
 
+    if (scaledBitmap == null) {
+      throw new BitmapDecodingException("Unable to decode image");
+    }
+    
     try {
       do {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();