commit f61e899ae9760a0e5d4fbfaf8a6fa3aee7789d95
author Wonsik Kim <wonsik@google.com> Tue Apr 27 13:09:47 2021 -0700
committer Wonsik Kim <wonsik@google.com> Thu Apr 29 20:53:58 2021 +0000
tree 892f5364f79b5439ab1f516c4a46da9f78286c7d
parent 22541847b5def260af65e91cd18142b19c6893a0

CCodecBufferChannel: add null checks

Bug: 185869285
Test: manual
Change-Id: I86cc4f37cd74704718accda4c8cc43f4121427a1

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 0008172..4485a1b 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1761,7 +1761,7 @@
         {
             Mutexed<Output>::Locked output(mOutput);
             numOutputSlots = output->numSlots;
-            reorderDepth = output->buffers->getReorderDepth();
+            reorderDepth = output->buffers ? output->buffers->getReorderDepth() : 0;
         }
         Mutexed<OutputSurface>::Locked output(mOutputSurface);
         output->maxDequeueBuffers = numOutputSlots + reorderDepth + kRenderingDepth;