commit c3c536d3c19bda16999656f1f614789c5ccd4991
author Pawin Vongmasa <pawin@google.com> Fri Jun 12 04:00:04 2020 -0700
committer Pawin Vongmasa <pawin@google.com> Fri Jun 12 05:05:28 2020 -0700
tree c8e850461cd750bd1caa977b8d6a3be37dccf999
parent 752adf7f1a340cbb6599fcff1842cf3659c75612

CCodec: Guard against null output->buffers

In CCodecBufferChannel::feedInputBufferIfAvailable(), there is a call to
output->buffers->hasPending(). Since we have changed the logic to allow
output->buffers to be null, the call to hasPending() must be done after
confirming that output->buffers is not null.

Test: atest CtsMediaTestCases

Bug: 158509743
Bug: 158539113
Change-Id: Icb1a46c954ff2b8d5018c0827ff9ca9acd8d4d8e

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index c07f3dc..2cd357b 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -618,13 +618,14 @@
 }
 
 void CCodecBufferChannel::feedInputBufferIfAvailableInternal() {
-    if (mInputMetEos ||
-           mOutput.lock()->buffers->hasPending() ||
-           mPipelineWatcher.lock()->pipelineFull()) {
+    if (mInputMetEos || mPipelineWatcher.lock()->pipelineFull()) {
         return;
-    } else {
+    }
+    {
         Mutexed<Output>::Locked output(mOutput);
-        if (!output->buffers || output->buffers->numClientBuffers() >= output->numSlots) {
+        if (!output->buffers ||
+                output->buffers->hasPending() ||
+                output->buffers->numClientBuffers() >= output->numSlots) {
             return;
         }
     }