commit a15f83fff9abb58beb0a9a0ba579492889a5010e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 29 01:45:54 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 29 01:45:54 2020 +0000
tree a4605ddd303678993ae05bd6b1cba1365bede131
parent 942b84ab12fbea6ac44946f0e77b09bc549a10cc
parent c23cc40082cd48bf69563257f1dce423b324b598

Merge "CCodec: fix crash at pushToStash" into rvc-dev

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,