Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Speculative fix for createBitmap crash

Browse Source 
Bug: 112551574
Test: Infeasible

Check for a null Bitmap before attempting to dereference it.

Change-Id: I250059e87540f005017abfdd9071f2fec86c1610
This commit is contained in:
Leon Scroggins III
2019-02-04 12:19:36 -05:00
parent 2c13539844
commit 023c0fc006
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android/graphics/BitmapFactory.cpp
View File

@@ -507,9 +507,18 @@ static jobject doDecode(JNIEnv* env, std::unique_ptr<SkStreamRewindable> stream,
ninePatchChunk, ninePatchInsets, -1);
}
// Speculative fix for b/112551574. It doesn't seem like |b| can be null. If it is, print some
// info that might be helpful to diagnose.
Bitmap* b = defaultAllocator.getStorageObjAndReset();
if (!b) {
ALOGW("defaultAllocator has no storage object!");
ALOGW("\tjavaBitmap: %s", (javaBitmap == nullptr ? "null" : "present"));
ALOGW("\tisHardware: %s", (isHardware ? "true" : "false"));
ALOGW("\twillScale: %s", (willScale ? "true" : "false"));
return nullptr;
}
// now create the java bitmap
return bitmap::createBitmap(env, defaultAllocator.getStorageObjAndReset(),
bitmapCreateFlags, ninePatchChunk, ninePatchInsets, -1);
return bitmap::createBitmap(env, b, bitmapCreateFlags, ninePatchChunk, ninePatchInsets, -1);
}
static jobject nativeDecodeStream(JNIEnv* env, jobject clazz, jobject is, jbyteArray storage,