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

Commit e1a80499 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audioeffect: Avoid potential NULL dereference"

parents ec025de9 866645d5

media/jni/audioeffect/android_media_AudioEffect.cpp

+5 −5
Original line number Diff line number Diff line
@@ -110,16 +110,16 @@ static void effectCallback(int event, void* user, void *info) { 
    effect_callback_cookie *callbackInfo = (effect_callback_cookie *)user;

    JNIEnv *env = AndroidRuntime::getJNIEnv();



    ALOGV("effectCallback: callbackInfo %p, audioEffect_ref %p audioEffect_class %p",

            callbackInfo,

            callbackInfo->audioEffect_ref,

            callbackInfo->audioEffect_class);



    if (!user || !env) {

        ALOGW("effectCallback error user %p, env %p", user, env);

        return;

    }



    ALOGV("effectCallback: callbackInfo %p, audioEffect_ref %p audioEffect_class %p",

            callbackInfo,

            callbackInfo->audioEffect_ref,

            callbackInfo->audioEffect_class);



    switch (event) {

    case AudioEffect::EVENT_CONTROL_STATUS_CHANGED:

        if (info == 0) {