| commit | 18c83054b46b036d8f4655618d6d9abb7b08ef1b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 20 21:41:40 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 20 21:41:40 2024 +0000 |
| tree | f70c519dc6d163c0220d1c6ff81a5a34f3c7bc7f | |
| parent | 2e2849b1889aec187df37d5e563e3c00803513a0 [diff] | |
| parent | 43147f43cf4a495ac01062e8d6f6a6e52a6985a6 [diff] |
Merge "codec2: BufferPoolClient: fix NPE in fetchBufferHandle if connection is null" into main am: 43147f43cf Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3222208 Change-Id: I44fcc7ab8a7ba9d62f6c120725ccafc445ccc447 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/module/bufferpool/2.0/BufferPoolClient.cpp b/media/module/bufferpool/2.0/BufferPoolClient.cpp index cda23ff..66d11fa 100644 --- a/media/module/bufferpool/2.0/BufferPoolClient.cpp +++ b/media/module/bufferpool/2.0/BufferPoolClient.cpp
@@ -762,6 +762,10 @@ } else { connection = mRemoteConnection; } + if (!connection) { + ALOGE("connection null: fetchBufferHandle()"); + return ResultStatus::CRITICAL_ERROR; + } ResultStatus status; Return<void> transResult = connection->fetch( transactionId, bufferId,