diff options
| author | Marco Nelissen <marcone@google.com> | 2016-02-29 12:47:20 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-04-21 19:09:54 -0700 |
| commit | 295c883fe3105b19bcd0f9e07d54c6b589fc5bff (patch) | |
| tree | 78e44d1f67000b06f9a621b01e11bb0fa647c59b /media/libstagefright/codecs/mp3dec/SoftMP3.cpp | |
| parent | daa85dac2055b22dabbb3b4e537597e6ab73a866 (diff) | |
| download | frameworks_av-295c883fe3105b19bcd0f9e07d54c6b589fc5bff.zip frameworks_av-295c883fe3105b19bcd0f9e07d54c6b589fc5bff.tar.gz frameworks_av-295c883fe3105b19bcd0f9e07d54c6b589fc5bff.tar.bz2 | |
DO NOT MERGE Verify OMX buffer sizes prior to access
Bug: 27207275
Change-Id: I4412825d1ee233d993af0a67708bea54304ff62d
Diffstat (limited to 'media/libstagefright/codecs/mp3dec/SoftMP3.cpp')
| -rw-r--r-- | media/libstagefright/codecs/mp3dec/SoftMP3.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp index f743b1c..9988015 100644 --- a/media/libstagefright/codecs/mp3dec/SoftMP3.cpp +++ b/media/libstagefright/codecs/mp3dec/SoftMP3.cpp @@ -128,6 +128,10 @@ OMX_ERRORTYPE SoftMP3::internalGetParameter( OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams = (OMX_AUDIO_PARAM_PCMMODETYPE *)params; + if (!isValidOMXParam(pcmParams)) { + return OMX_ErrorBadParameter; + } + if (pcmParams->nPortIndex > 1) { return OMX_ErrorUndefined; } @@ -151,6 +155,10 @@ OMX_ERRORTYPE SoftMP3::internalGetParameter( OMX_AUDIO_PARAM_MP3TYPE *mp3Params = (OMX_AUDIO_PARAM_MP3TYPE *)params; + if (!isValidOMXParam(mp3Params)) { + return OMX_ErrorBadParameter; + } + if (mp3Params->nPortIndex > 1) { return OMX_ErrorUndefined; } @@ -176,6 +184,10 @@ OMX_ERRORTYPE SoftMP3::internalSetParameter( const OMX_PARAM_COMPONENTROLETYPE *roleParams = (const OMX_PARAM_COMPONENTROLETYPE *)params; + if (!isValidOMXParam(roleParams)) { + return OMX_ErrorBadParameter; + } + if (strncmp((const char *)roleParams->cRole, "audio_decoder.mp3", OMX_MAX_STRINGNAME_SIZE - 1)) { @@ -190,6 +202,10 @@ OMX_ERRORTYPE SoftMP3::internalSetParameter( const OMX_AUDIO_PARAM_PCMMODETYPE *pcmParams = (const OMX_AUDIO_PARAM_PCMMODETYPE *)params; + if (!isValidOMXParam(pcmParams)) { + return OMX_ErrorBadParameter; + } + if (pcmParams->nPortIndex != 1) { return OMX_ErrorUndefined; } |