| commit | 8b0e74abf9e291a75bd802551cc066217fceadfa | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 20 20:20:32 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 20 20:20:32 2024 +0000 |
| tree | 5f87b663958ec2aac13f1339d224551658889087 | |
| parent | 14483ffaf016735da01102669611f025c06bb0e4 [diff] | |
| parent | c818adc8d452e97a1e6e96dc2b5477a92bd0b9cd [diff] |
Merge "codec2: BufferPoolClient: fix NPE in fetchBufferHandle if connection is null" into main am: c818adc8d4 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3222209 Change-Id: I92a78610de73a54bdda14ee447b46bd43a2af659 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 ce4ad8e..b61893f 100644 --- a/media/bufferpool/aidl/default/BufferPoolClient.cpp +++ b/media/bufferpool/aidl/default/BufferPoolClient.cpp
@@ -748,6 +748,10 @@ } else { connection = mRemoteConnection; } + if (!connection) { + ALOGE("connection null: fetchBufferHandle()"); + return ResultStatus::CRITICAL_ERROR; + } std::vector<FetchInfo> infos; std::vector<FetchResult> results; infos.emplace_back(FetchInfo{ToAidl(transactionId), ToAidl(bufferId)});