commit 43147f43cf4a495ac01062e8d6f6a6e52a6985a6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Aug 20 21:38:45 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 20 21:38:45 2024 +0000
tree 7444b2c6f21ac903b06de63ab4527cec46fd6c74
parent b23080b6cb54747e8695ac4fc6f5c9bc25924816
parent 335b556a39fd94d2090e0cf4f90c662db3b9b978

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

media/module/bufferpool/2.0/BufferPoolClient.cpp

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,