commit c23cc40082cd48bf69563257f1dce423b324b598
author Wonsik Kim <wonsik@google.com> Thu May 28 14:53:40 2020 -0700
committer Wonsik Kim <wonsik@google.com> Thu May 28 14:53:40 2020 -0700
tree ab529f3e15657dc548b36d24f3de9c9625da83bc
parent 2afc10bebb3849978a9ef9bcd6f4d586a33119d2

CCodec: fix crash at pushToStash

Bug: 157653199
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: Iacca0f3242d480992d513fbdb199892db5fb5bcf

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 8059ff6..907aa39 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1686,6 +1686,9 @@
 
     {
         Mutexed<Output>::Locked output(mOutput);
+        if (!output->buffers) {
+            return false;
+        }
         output->buffers->pushToStash(
                 buffer,
                 notifyClient,