commit b63880269349c53be8772b81cb77eddb3fad2769
author Sungtak Lee <taklee@google.com> Wed Jul 21 00:40:26 2021 -0700
committer Sungtak Lee <taklee@google.com> Wed Jul 21 21:40:53 2021 -0700
tree e56f8ade087981b316940e8418e04efd72c8932e
parent 9cef9404fbdc33db88f106020b8eaa150708946f

Codec2Client: Do not crash on configuring null output surface

Fix crash when configuring null output surface
Test: atest VtsHalMediaC2V1_0TargetVideoDecTest
Bug: 183660107

Change-Id: I22bbad6366884c3c8cbe184da8e4ba510bcb0c62

media/codec2/hidl/client/output.cpp

diff --git a/media/codec2/hidl/client/output.cpp b/media/codec2/hidl/client/output.cpp
index 8cd4934..de34c24 100644
--- a/media/codec2/hidl/client/output.cpp
+++ b/media/codec2/hidl/client/output.cpp
@@ -181,7 +181,7 @@
                                   int maxDequeueBufferCount,
                                   std::shared_ptr<V1_2::SurfaceSyncObj> *syncObj) {
     uint64_t consumerUsage = 0;
-    if (igbp->getConsumerUsage(&consumerUsage) != OK) {
+    if (igbp && igbp->getConsumerUsage(&consumerUsage) != OK) {
         ALOGW("failed to get consumer usage");
     }
 
@@ -254,6 +254,9 @@
         mBqId = bqId;
         mOwner = std::make_shared<int>(0);
         mMaxDequeueBufferCount = maxDequeueBufferCount;
+        if (igbp == nullptr) {
+            return false;
+        }
         for (int i = 0; i < BufferQueueDefs::NUM_BUFFER_SLOTS; ++i) {
             if (mBqId == 0 || !mBuffers[i]) {
                 continue;