diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-10 23:16:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 23:16:22 +0000 |
| commit | 3aef35600523eb6b4ccc8086a8913e80701a031a (patch) | |
| tree | 04abfec97e7e0d0b54b1037b06529d2ca26ebbdd /media | |
| parent | 4fbe49a83d41a64d44e363ccd691e7bfc41bb6af (diff) | |
| parent | e360f0f6cad290f69e07fd3a20dcf11a1dbc4160 (diff) | |
| download | frameworks_av-3aef35600523eb6b4ccc8086a8913e80701a031a.zip frameworks_av-3aef35600523eb6b4ccc8086a8913e80701a031a.tar.gz frameworks_av-3aef35600523eb6b4ccc8086a8913e80701a031a.tar.bz2 | |
am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessing
* commit 'e360f0f6cad290f69e07fd3a20dcf11a1dbc4160':
IAudioPolicyService: bound array size in queryDefaultPreProcessing
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index 386c351..109044d 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -23,6 +23,7 @@ #include <binder/Parcel.h> +#include <media/AudioEffect.h> #include <media/IAudioPolicyService.h> #include <system/audio.h> @@ -635,16 +636,18 @@ status_t BnAudioPolicyService::onTransact( CHECK_INTERFACE(IAudioPolicyService, data, reply); int audioSession = data.readInt32(); uint32_t count = data.readInt32(); + if (count > AudioEffect::kMaxPreProcessing) { + count = AudioEffect::kMaxPreProcessing; + } uint32_t retCount = count; - effect_descriptor_t *descriptors = - (effect_descriptor_t *)new char[count * sizeof(effect_descriptor_t)]; + effect_descriptor_t *descriptors = new effect_descriptor_t[count]; status_t status = queryDefaultPreProcessing(audioSession, descriptors, &retCount); reply->writeInt32(status); if (status != NO_ERROR && status != NO_MEMORY) { retCount = 0; } reply->writeInt32(retCount); - if (retCount) { + if (retCount != 0) { if (retCount < count) { count = retCount; } |