check if image decoding succeeded before using the result

Fixes #6061
Closes #6080
// FREEBIE
This commit is contained in:
Benedikt Constantin Radtke 2017-01-21 21:08:13 +01:00 committed by Moxie Marlinspike
parent 21a0fe3a48
commit 4461ebf662

View File

@ -59,6 +59,10 @@ public class BitmapUtil {
constraints.getImageMaxHeight(context), constraints.getImageMaxHeight(context),
DecodeFormat.PREFER_RGB_565); DecodeFormat.PREFER_RGB_565);
if (scaledBitmap == null) {
throw new BitmapDecodingException("Unable to decode image");
}
try { try {
do { do {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();