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

Commit 4526f0de authored by Peter Karlsson's avatar Peter Karlsson Committed by Zoran Jovanovic
Browse files

Handle errors from AudioEffect::queryNumberEffects 

There may be cases where queryNumberEffects fails leading
to the usage of the uninitialized numEffects.

Change-Id: If6d46987021ff6f0c9a2123d8714ff5fdf9ced45
parent 4299f63e

media/jni/audioeffect/android_media_AudioEffect.cpp

+5 −2
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ android_media_AudioEffect_native_queryEffects(JNIEnv *env, jclass clazz) 
{

    effect_descriptor_t desc;

    char str[EFFECT_STRING_LEN_MAX];

    uint32_t numEffects;

    uint32_t numEffects = 0;

    uint32_t i = 0;

    jstring jdescType;

    jstring jdescUuid;
@@ -714,7 +714,10 @@ android_media_AudioEffect_native_queryEffects(JNIEnv *env, jclass clazz) 
    jstring jdescImplementor;

    jobject jdesc;



    AudioEffect::queryNumberEffects(&numEffects);

    if (AudioEffect::queryNumberEffects(&numEffects) != NO_ERROR) {

        return NULL;

    }



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

    if (ret == NULL) {

        return ret;