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

Commit c4b71c93 authored by Saketh Sathuvalli's avatar Saketh Sathuvalli Committed by Greg Kaiser
Browse files

Fix for potential NULL de-reference issue in Reverb 

Fix for potential NULL de-reference issue in EffectReverb.cpp file

Test: android.media.cts.AudioEffectTest
Test: android.media.cts.AudioPreProcessingTest
Test: android.media.cts.BassBoostTest
Test: android.media.cts.EnvReverbTest
Test: android.media.cts.EqualizerTest
Test: android.media.cts.LoudnessEnhancerTest
Test: android.media.cts.PresetReverbTest
Test: android.media.cts.VirtualizerTest
Test: android.media.cts.VisualizerTest
Bug: 77731062, 154665188
Change-Id: Ib293173bb2512553bacb9a35dcf0f82bb290ede8
Merged-In: Ib293173bb2512553bacb9a35dcf0f82bb290ede8
parent 0c52b652

media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp

+5 −1
Original line number Diff line number Diff line
@@ -1906,11 +1906,15 @@ int Reverb_command(effect_handle_t self, 
            //ALOGV("\tReverb_command cmdCode Case: "

            //        "EFFECT_CMD_GET_PARAM start");

            effect_param_t *p = (effect_param_t *)pCmdData;

            if (pCmdData == nullptr) {

                ALOGW("\tLVM_ERROR : pCmdData is NULL");

                return -EINVAL;

            }

            if (SIZE_MAX - sizeof(effect_param_t) < (size_t)p->psize) {

                android_errorWriteLog(0x534e4554, "26347509");

                return -EINVAL;

            }

            if (pCmdData == NULL || cmdSize < sizeof(effect_param_t) ||

            if (cmdSize < sizeof(effect_param_t) ||

                    cmdSize < (sizeof(effect_param_t) + p->psize) ||

                    pReplyData == NULL || replySize == NULL ||

                    *replySize < (sizeof(effect_param_t) + p->psize)) {