commit 3785a50ef47208ff9291b270c7a3972d17759e09
author Mikhail Naganov <mnaganov@google.com> Tue Oct 31 18:49:27 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 31 18:49:27 2017 +0000
tree e4da463ea9bec0ce70cb4508104d3f86facda8ef
parent 46bc5d4f0b026f13a5f089a89b11e3e2e357eb03
parent 8aa73cce69dda19b17d08782386dc5e9e55e011c

Merge "Add EFFECT_CMD_SET_PARAM parameter checking to Preset Reverb" into lmp-mr1-dev am: 31b0c9cb33 am: be30bb2645 am: e2d671ce19
am: 8aa73cce69

Change-Id: I2d365422da18d7e1b09b02a0ae80a08dc8676d19

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 19892dd..80c8a38 100644
--- a/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
+++ b/media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp
@@ -1768,6 +1768,10 @@
         if (param != REVERB_PARAM_PRESET) {
             return -EINVAL;
         }
+        if (vsize < (int)sizeof(uint16_t)) {
+            android_errorWriteLog(0x534e4554, "67647856");
+            return -EINVAL;
+        }
 
         uint16_t preset = *(uint16_t *)pValue;
         ALOGV("set REVERB_PARAM_PRESET, preset %d", preset);