Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10701197 authored by Andy Hung's avatar Andy Hung
Browse files

AudioEffect: Fix memory leak in JNI 

Test: regression with CTS and solo tester
Bug: 112382112
Change-Id: I2929c038eb5f61c4110d375d6b17d28f627ce96f
parent 506723ec

media/jni/audioeffect/android_media_AudioEffect.cpp

+3 −5
Original line number Diff line number Diff line
@@ -824,21 +824,19 @@ static jobjectArray 
android_media_AudioEffect_native_queryPreProcessings(JNIEnv *env, jclass clazz __unused,

                                                     jint audioSession)

{

    effect_descriptor_t *descriptors = new effect_descriptor_t[AudioEffect::kMaxPreProcessing];

    auto descriptors = std::make_unique<effect_descriptor_t[]>(AudioEffect::kMaxPreProcessing);

    uint32_t numEffects = AudioEffect::kMaxPreProcessing;



    status_t status = AudioEffect::queryDefaultPreProcessing((audio_session_t) audioSession,

                                           descriptors,

                                           descriptors.get(),

                                           &numEffects);

    if (status != NO_ERROR || numEffects == 0) {

        delete[] descriptors;

        return NULL;

    }

    ALOGV("queryDefaultPreProcessing() got %d effects", numEffects);



    jobjectArray ret = env->NewObjectArray(numEffects, fields.clazzDesc, NULL);

    if (ret == NULL) {

        delete[] descriptors;

        return ret;

    }
@@ -875,7 +873,7 @@ android_media_AudioEffect_native_queryPreProcessings(JNIEnv *env, jclass clazz _ 
        if (jdesc == NULL) {

            ALOGE("env->NewObject(fields.clazzDesc, fields.midDescCstor)");

            env->DeleteLocalRef(ret);

            return NULL;;

            return NULL;

        }



        env->SetObjectArrayElement(ret, i, jdesc);