diff options
author | Glenn Kasten <gkasten@google.com> | 2012-01-06 08:40:01 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-01-17 07:45:07 -0800 |
commit | 263709e7be37c7040aaef385bc5c9389a9b5f514 (patch) | |
tree | 4a68796c8fe905b9924d7be1fc7192719f8a446a /services/audioflinger/AudioPolicyService.cpp | |
parent | 3944e0326a286bcb931551e61e79c033b10d09d4 (diff) | |
download | frameworks_av-263709e7be37c7040aaef385bc5c9389a9b5f514.zip frameworks_av-263709e7be37c7040aaef385bc5c9389a9b5f514.tar.gz frameworks_av-263709e7be37c7040aaef385bc5c9389a9b5f514.tar.bz2 |
Check stream type in AudioFlinger::createTrack
A bad parameter to AudioFlinger::createTrack could cause mediaserver to crash.
Other AudioFlinger stream type cleanup:
- Simplify range check for audio_stream_type_t
- Add comment about mStreamTypes array initialization.
Change-Id: Ia33aa1cce0fdd694b08d9288816ffc097a9543d0
Diffstat (limited to 'services/audioflinger/AudioPolicyService.cpp')
-rw-r--r-- | services/audioflinger/AudioPolicyService.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioPolicyService.cpp b/services/audioflinger/AudioPolicyService.cpp index b06bcb9..44311d0 100644 --- a/services/audioflinger/AudioPolicyService.cpp +++ b/services/audioflinger/AudioPolicyService.cpp @@ -400,7 +400,7 @@ status_t AudioPolicyService::initStreamVolume(audio_stream_type_t stream, if (!checkPermission()) { return PERMISSION_DENIED; } - if (stream < 0 || stream >= AUDIO_STREAM_CNT) { + if (uint32_t(stream) >= AUDIO_STREAM_CNT) { return BAD_VALUE; } mpAudioPolicy->init_stream_volume(mpAudioPolicy, stream, indexMin, indexMax); @@ -415,7 +415,7 @@ status_t AudioPolicyService::setStreamVolumeIndex(audio_stream_type_t stream, in if (!checkPermission()) { return PERMISSION_DENIED; } - if (stream < 0 || stream >= AUDIO_STREAM_CNT) { + if (uint32_t(stream) >= AUDIO_STREAM_CNT) { return BAD_VALUE; } @@ -427,7 +427,7 @@ status_t AudioPolicyService::getStreamVolumeIndex(audio_stream_type_t stream, in if (mpAudioPolicy == NULL) { return NO_INIT; } - if (stream < 0 || stream >= AUDIO_STREAM_CNT) { + if (uint32_t(stream) >= AUDIO_STREAM_CNT) { return BAD_VALUE; } return mpAudioPolicy->get_stream_volume_index(mpAudioPolicy, stream, index); |