commit 5dd792c86acf3696664ec15e98103907dcd3b114
author Akshata Kadam <akshata.jadhav@ittiam.com> Tue Sep 06 12:42:39 2022 +0530
committer Ayushi Khopkar <akhopkar@google.com> Tue Sep 06 08:11:27 2022 +0000
tree 7b860bc7b98438d5f20325b3a265b8918c988a33
parent d01cbef73def767423f6f43358e593da1993c0d0

ndk_sync_codec_fuzzer : Resolved Direct Memory Leak Issue

mFormat in NdkMediaCodecFuzzerBase class wasn't freed in
some cases. This CL creates a destructor for NdkMediaCodecFuzzerBase
and adds a free for mFormat in destructor. Also removes local call
to AMediaFormat_delete in ndk_sync_codec_fuzzer.

Test: $ANDROID_HOST_OUT/fuzz/x86_64/ndk_sync_codec_fuzzer/ndk_sync_codec_fuzzer CORPUS_DIR
Bug: 243215191

Change-Id: I84608dc934b21b71769a7d798af3f9bbf476d37e
(cherry picked from commit 03e1c251d2e090402a2bad30e8bee8924e065622)

media/ndk/fuzzer/NdkMediaCodecFuzzerBase.h

diff --git a/media/ndk/fuzzer/NdkMediaCodecFuzzerBase.h b/media/ndk/fuzzer/NdkMediaCodecFuzzerBase.h
index 42ef6ea..e810e55 100644
--- a/media/ndk/fuzzer/NdkMediaCodecFuzzerBase.h
+++ b/media/ndk/fuzzer/NdkMediaCodecFuzzerBase.h
@@ -46,6 +46,11 @@
     AMediaCodec* createCodec(bool isEncoder, bool isCodecForClient);
     AMediaFormat* getCodecFormat() { return mFormat; };
     void setFdp(FuzzedDataProvider* fdp) { mFdp = fdp; }
+    ~NdkMediaCodecFuzzerBase() {
+        if (mFormat) {
+            AMediaFormat_delete(mFormat);
+        }
+    }
 
   private:
     AMediaCodec* createAMediaCodecByname(bool isEncoder, bool isCodecForClient);

media/ndk/fuzzer/ndk_sync_codec_fuzzer.cpp

diff --git a/media/ndk/fuzzer/ndk_sync_codec_fuzzer.cpp b/media/ndk/fuzzer/ndk_sync_codec_fuzzer.cpp
index a3f3650..d348f66 100644
--- a/media/ndk/fuzzer/ndk_sync_codec_fuzzer.cpp
+++ b/media/ndk/fuzzer/ndk_sync_codec_fuzzer.cpp
@@ -41,14 +41,13 @@
 
 void NdkSyncCodecFuzzer::invokekSyncCodecAPIs(bool isEncoder) {
     ANativeWindow* nativeWindow = nullptr;
-    AMediaFormat* format = getCodecFormat();
     int32_t numOfFrames = mFdp.ConsumeIntegralInRange<size_t>(kMinIterations, kMaxIterations);
     int32_t count = 0;
     while (++count <= numOfFrames) {
         int32_t ndkcodecAPI = mFdp.ConsumeIntegralInRange<size_t>(kMinAPICase, kMaxNdkCodecAPIs);
         switch (ndkcodecAPI) {
             case 0: {  // configure the codec
-                AMediaCodec_configure(mCodec, format, nativeWindow, nullptr /* crypto */,
+                AMediaCodec_configure(mCodec, getCodecFormat(), nativeWindow, nullptr /* crypto */,
                                       (isEncoder ? AMEDIACODEC_CONFIGURE_FLAG_ENCODE : 0));
                 break;
             }
@@ -119,9 +118,6 @@
     if (nativeWindow) {
         ANativeWindow_release(nativeWindow);
     }
-    if (format) {
-        AMediaFormat_delete(format);
-    }
 }
 
 void NdkSyncCodecFuzzer::invokeSyncCodeConfigAPI() {