summaryrefslogtreecommitdiffstats
path: root/services/audiopolicy
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-01-15 23:11:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-15 23:11:40 +0000
commitc09eb2dfef090864e3ab827c12e724424fc8ca01 (patch)
tree5e133dbdce48e3fd13c9dba5c88b0bd27d50134b /services/audiopolicy
parent1509765f2262e4582cdcfdb064417884a3efa04c (diff)
parent65cb339de0f628c82bdd5c68d868b6f3dc83cf04 (diff)
downloadframeworks_av-c09eb2dfef090864e3ab827c12e724424fc8ca01.zip
frameworks_av-c09eb2dfef090864e3ab827c12e724424fc8ca01.tar.gz
frameworks_av-c09eb2dfef090864e3ab827c12e724424fc8ca01.tar.bz2
am 65cb339d: am 21291a42: Merge "fix leak in audio policy effect config parser" into lmp-mr1-dev
* commit '65cb339de0f628c82bdd5c68d868b6f3dc83cf04': fix leak in audio policy effect config parser
Diffstat (limited to 'services/audiopolicy')
-rw-r--r--services/audiopolicy/AudioPolicyEffects.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyEffects.cpp b/services/audiopolicy/AudioPolicyEffects.cpp
index 4fbe042..e6ace20 100644
--- a/services/audiopolicy/AudioPolicyEffects.cpp
+++ b/services/audiopolicy/AudioPolicyEffects.cpp
@@ -658,6 +658,10 @@ status_t AudioPolicyEffects::loadAudioEffectConfig(const char *path)
loadInputEffectConfigurations(root, effects);
loadStreamEffectConfigurations(root, effects);
+ for (size_t i = 0; i < effects.size(); i++) {
+ delete effects[i];
+ }
+
config_free(root);
free(root);
free(data);