commit b7bd4e19084f2f03e98af7daa0ef86fd791f8a55
author Akhilesh C Sanikop <akhilesh.sanikop@ittiam.com> Tue Sep 26 18:55:11 2023 +0530
committer Akhilesh C Sanikop <akhilesh.sanikop@ittiam.com> Tue Sep 26 18:55:11 2023 +0530
tree 3b8098a0704160d4c12f7cb30c170997c7c5e434
parent dcd31c4112385fc10801b9038285b11e46790e54

mpeg4_writer_fuzzer: Bug Fix

Resolved CHECK_FAILURE issue in mpeg4_writer_fuzzer

exec/s: 1000
Test: ./mpeg4_writer_fuzzer clusterfuzz-testcase-minimized-mpeg4_writer_fuzzer-6028683380850688
Bug: 297948485

Change-Id: I19b9b15f4cde0224e2dd4f8ab501f2d0c22fe624

media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp

diff --git a/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp b/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp
index 2016b2a..fee5c94 100644
--- a/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp
+++ b/media/libstagefright/writer_fuzzers/WriterFuzzerBase.cpp
@@ -226,7 +226,13 @@
         mediaBuffer->add_ref();
 
         // This pushBuffer will wait until the mediaBuffer is consumed.
-        if (currentTrack->pushBuffer(mediaBuffer) != OK) {
+        android::status_t pushStatus = currentTrack->pushBuffer(mediaBuffer);
+
+        if (pushStatus != OK) {
+            if (pushStatus == INVALID_OPERATION) {
+                // In Case of INVALID_OPERATION, mObserver needs to be set before calling release()
+                mediaBuffer->setObserver(currentTrack.get());
+            }
             mediaBuffer->release();
         }
     }