commit c4b71c9302c61ed47129991c4608034d59f05a29
author Saketh Sathuvalli <saketh.sathuvalli@ittiam.com> Wed Mar 11 13:06:27 2020 +0530
committer Greg Kaiser <gkaiser@google.com> Tue Apr 21 19:19:07 2020 -0700
tree b7575020f9aecdec48b94749ec1c90bb634a5027
parent 0c52b65211fc296a3139bcfb094ff2e22371baac

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

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

diff --git a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
index 1cb81a6..39f5bb6 100644
--- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
+++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
@@ -1906,11 +1906,15 @@
             //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)) {