From 6652cc6ad5c1f501c1430bbadc1848a301d1828f Mon Sep 17 00:00:00 2001
From: mtk28629 <chengting.tsai@mediatek.com>
Date: Tue, 4 Jun 2024 10:50:30 +0800
Subject: [PATCH] codec2: BufferPoolClient: fix NPE in fetchBufferHandle if
 connection is null

Do a null pointer check before connection->fetch().

Bug: 344846184
Flag: EXEMPT bugfix
Test:
1.atest android.media.decoder.cts.AdaptivePlaybackTest
2.atest android.media.decoder.cts.DecoderTest

Change-Id: I30031b4abf46f920b708320ffa3fa9d1598027b4
---
 media/bufferpool/aidl/default/BufferPoolClient.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media/bufferpool/aidl/default/BufferPoolClient.cpp b/media/bufferpool/aidl/default/BufferPoolClient.cpp
index ce4ad8e37f..b61893fdc1 100644
--- a/media/bufferpool/aidl/default/BufferPoolClient.cpp
+++ b/media/bufferpool/aidl/default/BufferPoolClient.cpp
@@ -748,6 +748,10 @@ BufferPoolStatus BufferPoolClient::Impl::fetchBufferHandle(
     } 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)});