commit 7427d3754268f65109c34883a5c7d7e6f1d30f1f
author Chih-Yu Huang <akahuang@google.com> Wed Dec 02 16:16:57 2020 +0900
committer Chih-yu Huang <akahuang@google.com> Wed Dec 09 00:30:21 2020 +0000
tree 7806efe0196b691b09b75bc140c89cf71634c8b0
parent 9b95dd2f7e88bd1ddaf5b765ffe7845cabe6edbc

CCBC: Fix null pointer exception at CCBC::flush()

The description of C2Work says:
"When the work is returned (via onWorkDone), the input buffer-pack's
buffer vector shall contain nullptrs." This CL handles the case that
C2Work's input buffers contains nullptr.

Bug: 174432542
Test: android.mediav2.cts.CodecDecoderSurfaceTest
Change-Id: Ife7fb849c88c82f92a0bb687b5f1f6bcb171686b

media/codec2/sfplugin/CCodecBufferChannel.cpp

diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 3ef454b..06464b5 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -1403,6 +1403,7 @@
                 continue;
             }
             if (work->input.buffers.empty()
+                    || work->input.buffers.front() == nullptr
                     || work->input.buffers.front()->data().linearBlocks().empty()) {
                 ALOGD("[%s] no linear codec config data found", mName);
                 continue;