Fix transactionCallbackThunk lifetime issue
TestBLASTBufferQueue overrides transactionCallback but BLASTBufferQueue::transactionCallback can trigger the destruction of BLASTBufferQueue, causing native crashes. This CL fixes the issue by moving the decStrong call after transactionCallback has completed.
Bug: 294133380
Flag: EXEMPT bugfix
Test: BLASTBufferQueueTest
Change-Id: Ia2344ed6d14e89026f464b32c95c76b3a96a19d0
diff --git a/libs/gui/BLASTBufferQueue.cpp b/libs/gui/BLASTBufferQueue.cpp
index f065ffa..1fb59fd 100644
--- a/libs/gui/BLASTBufferQueue.cpp
+++ b/libs/gui/BLASTBufferQueue.cpp
@@ -356,8 +356,9 @@
if (context == nullptr) {
return;
}
- sp<BLASTBufferQueue> bq = static_cast<BLASTBufferQueue*>(context);
+ auto bq = static_cast<BLASTBufferQueue*>(context);
bq->transactionCallback(latchTime, presentFence, stats);
+ bq->decStrong((void*)transactionCallbackThunk);
}
void BLASTBufferQueue::transactionCallback(nsecs_t /*latchTime*/, const sp<Fence>& /*presentFence*/,
@@ -413,8 +414,6 @@
BQA_LOGE("No matching SurfaceControls found: mSurfaceControlsWithPendingCallback was "
"empty.");
}
-
- decStrong((void*)transactionCallbackThunk);
}
}