commit 0d77973e735b769fbea7265e7a5b963d01590581
author Andy Hung <hunga@google.com> Tue Jun 06 21:36:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 06 21:36:36 2017 +0000
tree 52656f79d1d0a53c31b49b53998eb2dfc397ad2f
parent fde4cbba53d8396832b8099c8f6cfcdc2796b1be
parent 0d340d4990efbff486f6bf1fade08c9b0c028cc2

Merge "EffectBundle: Check value size for get preset name" into klp-dev am: f5d6e98996 am: b401a3bf44 am: 1f44782e92 am: ea83248dfb am: 716d258db4 am: f043bb5da6 am: 4d76e5bcd6 am: f21d5b4580 am: f0221a7dbe am: b26594e6ae am: 158ec15776 am: 426244d6dc am: c47adacb0d
am: 0d340d4990

Change-Id: I04c860d923c1d48295472f302ebf59376e21f35b

media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp

diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
index 592ec13..a0af3cf 100644
--- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
+++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp
@@ -2436,6 +2436,13 @@
             }
             break;
         }
+
+        if (*pValueSize < 1) {
+            status = -EINVAL;
+            android_errorWriteLog(0x534e4554, "37536407");
+            break;
+        }
+
         name = (char *)pValue;
         strncpy(name, EqualizerGetPresetName(param2), *pValueSize - 1);
         name[*pValueSize - 1] = 0;