Check the part stream is non-null before decoding

// FREEBIE

Closes #2459
This commit is contained in:
Jake McGinty 2015-02-11 18:15:50 -08:00 committed by Moxie Marlinspike
parent aa26785c00
commit 5bd8d6c69d

View File

@ -80,7 +80,9 @@ public class BitmapUtil {
private static Bitmap createScaledBitmap(Context context, MasterSecret masterSecret, Uri uri, int maxWidth, int maxHeight, boolean constrainedMemory) private static Bitmap createScaledBitmap(Context context, MasterSecret masterSecret, Uri uri, int maxWidth, int maxHeight, boolean constrainedMemory)
throws IOException, BitmapDecodingException throws IOException, BitmapDecodingException
{ {
return createScaledBitmap(PartAuthority.getPartStream(context, masterSecret, uri), InputStream is = PartAuthority.getPartStream(context, masterSecret, uri);
if (is == null) throw new IOException("Couldn't obtain InputStream");
return createScaledBitmap(is,
PartAuthority.getPartStream(context, masterSecret, uri), PartAuthority.getPartStream(context, masterSecret, uri),
PartAuthority.getPartStream(context, masterSecret, uri), PartAuthority.getPartStream(context, masterSecret, uri),
maxWidth, maxHeight, constrainedMemory); maxWidth, maxHeight, constrainedMemory);