commit 1238007f4688d311799b8fdd12c0154f35ebc4e5
author Wonsik Kim <wonsik@google.com> Tue May 11 09:59:20 2021 -0700
committer Wonsik Kim <wonsik@google.com> Tue May 11 09:59:20 2021 -0700
tree a8e8ba1264ce5daea93a0e9c7b526af7fb9c2ae0
parent c5dd9f43449135edd20c12d6a3a00b86902e7c26

CCodec: fix nullptr deref at initiateReleaseIfStuck

Bug: 187320018
Test: Treehugger
Change-Id: I489bd8fb28fac7a4165933e536ea4bba11898236

media/codec2/sfplugin/CCodec.cpp

diff --git a/media/codec2/sfplugin/CCodec.cpp b/media/codec2/sfplugin/CCodec.cpp
index 2599ef6..7ef5252 100644
--- a/media/codec2/sfplugin/CCodec.cpp
+++ b/media/codec2/sfplugin/CCodec.cpp
@@ -2400,6 +2400,11 @@
     C2String compName;
     {
         Mutexed<State>::Locked state(mState);
+        if (!state->comp) {
+            ALOGD("previous call to %s exceeded timeout "
+                  "and the component is already released", name.c_str());
+            return;
+        }
         compName = state->comp->getName();
     }
     ALOGW("[%s] previous call to %s exceeded timeout", compName.c_str(), name.c_str());