commit c818adc8d452e97a1e6e96dc2b5477a92bd0b9cd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 20 20:16:45 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 20 20:16:45 2024 +0000
tree 69ea1a7ef79fcc8faf1c4a33763516231922cab8
parent 08c7c29c11ec7bcd2de00865b24e13284964dcff
parent 6652cc6ad5c1f501c1430bbadc1848a301d1828f

Merge "codec2: BufferPoolClient: fix NPE in fetchBufferHandle if connection is null" into main

media/bufferpool/aidl/default/BufferPoolClient.cpp

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)});