commit e1a58dfcd23da01e0bb513bf49a8442966859a37
author heychen <heychen@realtek.com> Fri Sep 06 14:29:46 2024 +0800
committer heychen <heychen@realtek.com> Fri Sep 06 14:32:21 2024 +0800
tree 75b7747ccb3e8bdecdbed2aea9ab615f5225bf77
parent a73556cb5772727fd84b88befcba9c9af55445db

CtsSecurityTestCases.android.security.cts.StagefrightTest#testStagefright_cve_2016_2507

FrameDecoder not check mediaBuffer nullptr
add nullptr check

Bug: 365002357
Change-Id: I2e8f351892457028ca6ae4e5035ff634cd560fe6

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;
     }