| commit | 71d3a7ccbc00fa7366c59a47b5876f3572ac4f52 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Dec 28 03:51:29 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 28 03:51:29 2023 +0000 |
| tree | bbf4283db6a8be608d40a98be87dad811a2be1a5 | |
| parent | 002c58fafdaeae317be13e6c4fac2858b071c15a [diff] | |
| parent | 85333361c17d5fd65360ab6b57e6f9a8e744fe63 [diff] |
Merge "BufferPoolClient: avoid dereference null accessor" into main am: 85333361c1 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889801 Change-Id: I4b1dbf1a83ca968af93e860ed92baaec5640b51c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/bufferpool/aidl/default/BufferPoolClient.cpp b/media/bufferpool/aidl/default/BufferPoolClient.cpp index e9777d8..0e249d5 100644 --- a/media/bufferpool/aidl/default/BufferPoolClient.cpp +++ b/media/bufferpool/aidl/default/BufferPoolClient.cpp
@@ -297,7 +297,7 @@ mLastEvictCacheMs(::android::elapsedRealtime()) { IAccessor::ConnectionInfo conInfo; bool valid = false; - if(accessor->connect(observer, &conInfo).isOk()) { + if (accessor && accessor->connect(observer, &conInfo).isOk()) { auto channel = std::make_unique<BufferStatusChannel>(conInfo.toFmqDesc); auto observer = std::make_unique<BufferInvalidationListener>(conInfo.fromFmqDesc);