commit 8e45cd1268265d3cce2829afd6228dde9aecb15a
author Wonsik Kim <wonsik@google.com> Mon Sep 09 20:18:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Sep 09 20:18:27 2024 +0000
tree 73f5e3e23593b1218db6616cfc74a1b4ae113416
parent 17eaf20edfd8fb0a16bdad8f6c43ff96b31fc2ba
parent e1a58dfcd23da01e0bb513bf49a8442966859a37

Merge "CtsSecurityTestCases.android.security.cts.StagefrightTest#testStagefright_cve_2016_2507" into main

media/libstagefright/FrameDecoder.cpp

diff --git a/media/libstagefright/FrameDecoder.cpp b/media/libstagefright/FrameDecoder.cpp
index 893b442..cc78510 100644
--- a/media/libstagefright/FrameDecoder.cpp
+++ b/media/libstagefright/FrameDecoder.cpp
@@ -654,7 +654,9 @@
     mReadOptions.clearSeekTo();
     if (err != OK) {
         ALOGW("Input Error: err=%d", err);
-        mediaBuffer->release();
+        if (mediaBuffer) {
+            mediaBuffer->release();
+        }
         return err;
     }