Make getDataSpace fail instead of crash on recycled

Bug: 135133301
Test: I32e9a257a63382629b25f64d1d0abe9682ddec70

Make sure the Bitmap is valid before trying to read its data space.

Change-Id: I0d075197ddc548143a4e4845cc5cc5d3b10d87c7
This commit is contained in:
Leon Scroggins III
2020-01-19 19:32:43 -05:00
parent 84a2afcbfb
commit f8e41c5fc2

View File

@@ -33,10 +33,14 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) {
if (NULL == env || NULL == jbitmap) {
return ADATASPACE_UNKNOWN; // Or return a real error?
return ADATASPACE_UNKNOWN;
}
android::graphics::Bitmap bitmap(env, jbitmap);
if (!bitmap.isValid()) {
return ADATASPACE_UNKNOWN;
}
return bitmap.getDataSpace();
}