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

Check for null buffer when calling Transaction#setBuffer

Browse Source 
android_hardware_HardwareBuffer_getNativeHardwareBuffer will crash when
trying to convert a null object to a GraphicBuffer. Instead, just set
the GraphicBuffer to null and call into SCC with a null buffer. This
will result in the previous buffer getting released

Test: SurfaceControlTest
Fixes: 233252754
Change-Id: Idc9f5ca3d747dbc890d7cafb9512c51ca9e711c9
This commit is contained in:
chaviw
2022-05-19 17:47:20 -05:00
parent 4304b4b031
commit eab2a2312c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/jni/android_view_SurfaceControl.cpp
View File

@@ -688,8 +688,11 @@ static void nativeSetBuffer(JNIEnv* env, jclass clazz, jlong transactionObj, jlo
jobject bufferObject, jlong fencePtr, jobject releaseCallback) {
auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionObj);
SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl*>(nativeObject);
sp<GraphicBuffer> graphicBuffer(GraphicBuffer::fromAHardwareBuffer(
android_hardware_HardwareBuffer_getNativeHardwareBuffer(env, bufferObject)));
sp<GraphicBuffer> graphicBuffer;
if (bufferObject != nullptr) {
graphicBuffer = GraphicBuffer::fromAHardwareBuffer(
android_hardware_HardwareBuffer_getNativeHardwareBuffer(env, bufferObject));
}
std::optional<sp<Fence>> optFence = std::nullopt;
if (fencePtr != 0) {
optFence = sp<Fence>{reinterpret_cast<Fence*>(fencePtr)};