diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-07-15 03:40:50 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-07-15 03:40:50 +0000 |
| commit | d120b3e4d417964edf8f9bb9d1d812e82185fb09 (patch) | |
| tree | 2cb37ab28c0bb07aacdc92e60cca2eb6a6e7bb33 | |
| parent | badda58f04f1f37f88cb3ba828e9d32c5d399bd3 (diff) | |
| parent | aedc028e04a38df0b021d57109e270873df8db19 (diff) | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28105102'] into udc-platform-release.
Change-Id: I943eb4abfdd5dd1b6ecefd64e8c26a0cf9ca969b
| -rw-r--r-- | media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp index 418302389d..4ab5d10609 100644 --- a/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp +++ b/media/libstagefright/omx/SoftVideoDecoderOMXComponent.cpp @@ -619,6 +619,13 @@ OMX_ERRORTYPE SoftVideoDecoderOMXComponent::getConfig( if (!isValidOMXParam(outParams)) { return OMX_ErrorBadParameter; } + if (offsetof(DescribeHDR10PlusInfoParams, nValue) + outParams->nParamSize > + outParams->nSize) { + ALOGE("b/329641908: too large param size; nParamSize=%u nSize=%u", + outParams->nParamSize, outParams->nSize); + android_errorWriteLog(0x534e4554, "329641908"); + return OMX_ErrorBadParameter; + } outParams->nParamSizeUsed = info->size(); |